diff options
| author | Martijn Coenen <maco@google.com> | 2017-11-13 16:56:42 +0100 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2017-11-13 20:42:40 +0000 |
| commit | cf426f0fea02e7190c41c0576634936164b51adc (patch) | |
| tree | b7aa7aaed5635ea077e332875a39eaecb2d1ac7b | |
| parent | 0f2eb8b2ee955c66a99c5f73af2cdfd2ed67df87 (diff) | |
Fix library loading order in .mk files.
Test: angler boots again
Bug: 69180318
Change-Id: Id71e2348eabf5101d1fd286bbc0076154703d159
Merged-In: Id71e2348eabf5101d1fd286bbc0076154703d159
| -rw-r--r-- | configstore/1.1/default/Android.mk | 4 | ||||
| -rw-r--r-- | wifi/1.1/default/Android.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configstore/1.1/default/Android.mk b/configstore/1.1/default/Android.mk index ac3d8b039d..a3a1041223 100644 --- a/configstore/1.1/default/Android.mk +++ b/configstore/1.1/default/Android.mk @@ -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) diff --git a/wifi/1.1/default/Android.mk b/wifi/1.1/default/Android.mk index 5758422303..ee912c5ec7 100644 --- a/wifi/1.1/default/Android.mk +++ b/wifi/1.1/default/Android.mk @@ -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) |