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

am: 38aee48fc6 * commit '38aee48fc695c25e15435e4ef235c8bc2e0afde9': init/adb: correct static lib dependencies for libselinux
2015-10-22 23:12:22 +00:00 · 2015-10-22 23:12:22 +00:00 · 27ff12443d
parent ac4e509328 38aee48fc6
commit 27ff12443d
2 changed files with 2 additions and 2 deletions
--- a/adb/Android.mk
+++ b/adb/Android.mk
@ -296,9 +296,9 @@ LOCAL_STATIC_LIBRARIES := \
    libfs_mgr \
    libfec \
    libfec_rs \
+    libselinux \
    liblog \
    libmincrypt \
-    libselinux \
    libext4_utils_static \
    libsquashfs_utils \
    libcutils \
--- a/init/Android.mk
+++ b/init/Android.mk
@ -92,9 +92,9 @@ LOCAL_STATIC_LIBRARIES := \
    libbase \
    libext4_utils_static \
    libutils \
-    liblog \
    libc \
    libselinux \
+    liblog \
    libmincrypt \
    libcrypto_static \
    libc++_static \