commit 3092f98101991c06b0d2e33326a8b3b6af0b143b
author Martijn Coenen <maco@google.com> Mon Nov 13 23:48:17 2017 +0100
committer Martijn Coenen <maco@google.com> Tue Nov 14 08:37:32 2017 +0000
tree c61728dd781a485f363bdba4ebef0d004257bddb
parent a9a2b28709d4cd324e74417599c87bcb42608f53
parent 32ba3eaadebd132204d0feb8b9e24e7d55cac710

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

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I731eba80656edbf87a5d5ba3af63a2c607ac61a6
Merged-In: Id71e2348eabf5101d1fd286bbc0076154703d159

configstore/1.0/default/Android.mk

diff --git a/configstore/1.0/default/Android.mk b/configstore/1.0/default/Android.mk
index 8b24031..240b2a2 100644
--- a/configstore/1.0/default/Android.mk
+++ b/configstore/1.0/default/Android.mk
@@ -13,13 +13,13 @@
 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)
 

wifi/1.1/default/Android.mk

diff --git a/wifi/1.1/default/Android.mk b/wifi/1.1/default/Android.mk
index 5758422..ee912c5 100644
--- a/wifi/1.1/default/Android.mk
+++ b/wifi/1.1/default/Android.mk
@@ -37,8 +37,6 @@
     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 @@
     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)