tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

Browse source
This commit is contained in:
TreeHugger Robot 2017-11-14 11:00:56 +00:00 committed by Android (Google) Code Review
commit 75b8428b4c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configstore/1.0/default/Android.mk
View file

@ -13,13 +13,13 @@ LOCAL_SRC_FILES:= service.cpp
include $(LOCAL_PATH)/surfaceflinger.mk
LOCAL_SHARED_LIBRARIES := \
android.hardware.configstore@1.0 \
libhidlbase \
libhidltransport \
libbase \
libhwminijail \
liblog \
libutils \
android.hardware.configstore@1.0 \
include $(BUILD_EXECUTABLE)

6
wifi/1.1/default/Android.mk
View file

@ -37,8 +37,6 @@ LOCAL_SRC_FILES := \
wifi_sta_iface.cpp \
wifi_status_util.cpp
LOCAL_SHARED_LIBRARIES := \
android.hardware.wifi@1.0 \
android.hardware.wifi@1.1 \
libbase \
libcutils \
libhidlbase \
@ -47,6 +45,8 @@ LOCAL_SHARED_LIBRARIES := \
libnl \
libutils \
libwifi-hal \
libwifi-system-iface
libwifi-system-iface \
android.hardware.wifi@1.0 \
android.hardware.wifi@1.1
LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
include $(BUILD_EXECUTABLE)