commit 7334b387d8eb957687daf8a91095e40acd0bb6f2
author Alex Deymo <deymo@google.com> Sat Oct 10 00:01:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 10 00:01:40 2015 +0000
tree 2a75ba044c846737edefb19bc3b06bb26fde4700
parent 7e13b005a84763110ce539ba8f64d08b47c016c9
parent eadab7d02e5815121b0db480ee7c0347800dc4ca

Merge "Android.mk: Sort library dependencies."

Android.mk

diff --git a/Android.mk b/Android.mk
index a1edf1c..9755896 100644
--- a/Android.mk
+++ b/Android.mk
@@ -106,20 +106,20 @@
     update_engine-dbus-adaptor \
     update_engine-dbus-libcros-client \
     update_engine_client-dbus-proxies \
+    libxz \
     libbz \
-    libfs_mgr \
-    libxz
+    libfs_mgr
 LOCAL_SHARED_LIBRARIES += \
     libprotobuf-cpp-lite-rtti \
     libdbus \
     libcrypto \
     libcurl \
-    libcutils \
-    libhardware \
     libmetrics \
     libssl \
     libexpat \
-    libchromeos-policy
+    libchromeos-policy \
+    libhardware \
+    libcutils
 LOCAL_SRC_FILES := \
     action_processor.cc \
     boot_control_android.cc \
@@ -194,22 +194,22 @@
     libupdate_engine \
     libbz \
     libfs_mgr \
-    libxz \
     update_metadata-protos \
     update_engine-dbus-adaptor \
     update_engine-dbus-libcros-client \
-    update_engine_client-dbus-proxies
+    update_engine_client-dbus-proxies \
+    libxz
 LOCAL_SHARED_LIBRARIES += \
     libprotobuf-cpp-lite-rtti \
     libdbus \
     libcrypto \
     libcurl \
-    libcutils \
-    libhardware \
     libmetrics \
     libssl \
     libexpat \
-    libchromeos-policy
+    libchromeos-policy \
+    libhardware \
+    libcutils
 LOCAL_SRC_FILES := \
     main.cc
 LOCAL_INIT_RC := update_engine.rc
@@ -242,11 +242,11 @@
     libupdate_engine \
     libbz \
     libfs_mgr \
-    libxz \
     update_metadata-protos \
     update_engine-dbus-adaptor \
     update_engine-dbus-libcros-client \
     update_engine_client-dbus-proxies \
+    libxz \
     update_metadata-protos
 LOCAL_SHARED_LIBRARIES += \
     libdbus \
@@ -256,6 +256,8 @@
     libssl \
     libexpat \
     libchromeos-policy \
+    libhardware \
+    libcutils \
     libprotobuf-cpp-lite-rtti \
     libext2fs
 LOCAL_SRC_FILES := \
@@ -293,11 +295,11 @@
     libupdate_engine \
     libbz \
     libfs_mgr \
-    libxz \
     update_metadata-protos \
     update_engine-dbus-adaptor \
     update_engine-dbus-libcros-client \
-    update_engine_client-dbus-proxies
+    update_engine_client-dbus-proxies \
+    libxz
 LOCAL_SHARED_LIBRARIES += \
     libdbus \
     libcrypto \
@@ -306,6 +308,8 @@
     libssl \
     libexpat \
     libchromeos-policy \
+    libhardware \
+    libcutils \
     libprotobuf-cpp-lite-rtti \
     libext2fs
 LOCAL_SRC_FILES := \