commit b6fa3ae638451157866b765b2297f7a93fd6a769
author Martijn Coenen <maco@google.com> Mon Nov 13 16:56:42 2017 +0100
committer Martijn Coenen <maco@google.com> Mon Nov 13 19:59:54 2017 +0100
tree 8bc70f16b6d7b014e74acc677689ea80adbb62bc
parent 446e97afaf2619030c44b23a07c1074349ca816f

Fix library loading order in .mk files.

Test: angler boots again
Bug: 69180318
Change-Id: Id71e2348eabf5101d1fd286bbc0076154703d159

configstore/1.1/default/Android.mk

diff --git a/configstore/1.1/default/Android.mk b/configstore/1.1/default/Android.mk
index 58b67c1..53e454b 100644
--- a/configstore/1.1/default/Android.mk
+++ b/configstore/1.1/default/Android.mk
@@ -13,14 +13,14 @@
 include $(LOCAL_PATH)/surfaceflinger.mk
 
 LOCAL_SHARED_LIBRARIES := \
-    android.hardware.configstore@1.0 \
-    android.hardware.configstore@1.1 \
     libhidlbase \
     libhidltransport \
     libbase \
     libhwminijail \
     liblog \
     libutils \
+    android.hardware.configstore@1.0 \
+    android.hardware.configstore@1.1
 
 include $(BUILD_EXECUTABLE)
 

wifi/1.2/default/Android.mk

diff --git a/wifi/1.2/default/Android.mk b/wifi/1.2/default/Android.mk
index 6ce5e89..b242cfc 100644
--- a/wifi/1.2/default/Android.mk
+++ b/wifi/1.2/default/Android.mk
@@ -37,9 +37,6 @@
     wifi_sta_iface.cpp \
     wifi_status_util.cpp
 LOCAL_SHARED_LIBRARIES := \
-    android.hardware.wifi@1.0 \
-    android.hardware.wifi@1.1 \
-    android.hardware.wifi@1.2 \
     libbase \
     libcutils \
     libhidlbase \
@@ -48,6 +45,9 @@
     libnl \
     libutils \
     libwifi-hal \
-    libwifi-system-iface
+    libwifi-system-iface \
+    android.hardware.wifi@1.0 \
+    android.hardware.wifi@1.1 \
+    android.hardware.wifi@1.2
 LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
 include $(BUILD_EXECUTABLE)