Merge "Fix library loading order in .mk files."

am: b796529a56

Change-Id: I19dcd234f143c9aae758ea66d9273d015d04e7b7
This commit is contained in:
Martijn Coenen
2017-11-13 22:08:08 +00:00
committed by android-build-merger
2 changed files with 5 additions and 5 deletions

View File

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

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)