commit 7972e7963af74775561d96a73a9f479050a34f47
author Daniel Cashman <dcashman@google.com> Thu Oct 22 23:12:22 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 22 23:12:22 2015 +0000
tree 398592f67fe6c7911d341290c34db094c7a96a14
parent 29baf86973db3739a9f863bf1b5c13f2ed949137
parent 3c85373e431479fbb9dc4181c05630d6e4f73b2e

Merge "init/adb: correct static lib dependencies for libselinux"
am: 38aee48fc6

* commit '38aee48fc695c25e15435e4ef235c8bc2e0afde9':
  init/adb: correct static lib dependencies for libselinux

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index e10e3ef..2538e2e 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -296,9 +296,9 @@
     libfs_mgr \
     libfec \
     libfec_rs \
+    libselinux \
     liblog \
     libmincrypt \
-    libselinux \
     libext4_utils_static \
     libsquashfs_utils \
     libcutils \

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 8e45a7a..d6cb4e5 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -92,9 +92,9 @@
     libbase \
     libext4_utils_static \
     libutils \
-    liblog \
     libc \
     libselinux \
+    liblog \
     libmincrypt \
     libcrypto_static \
     libc++_static \