commit 7aa2fca9ef05615c1e66d6ab7d0fb9d634c26e80
author Tao Bao <tbao@google.com> Fri Sep 29 18:18:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 29 18:18:56 2017 +0000
tree 71f246c63d16dfc54d086a49899fef6739972f04
parent b5dfc86eafef10c73904e161b604285e6346468e
parent d76a2e4c1422985aa9560b7ab53c47a8e8709064

Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e am: 8277230a98
am: d76a2e4c14

Change-Id: I7a97d1a8c4ace0d715381c4cedc03d53389198b6

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 59aa0ce..f5dda2b 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -112,11 +112,13 @@
 LOCAL_STATIC_LIBRARIES := \
     libapplypatch_modes \
     libapplypatch \
-    libbase \
     libedify \
     libotafault \
-    libcrypto \
     libbspatch \
+    libbase \
+    libziparchive \
+    liblog \
+    libcrypto \
     libbz
 LOCAL_SHARED_LIBRARIES := \
     libbase \

otafault/Android.mk

diff --git a/otafault/Android.mk b/otafault/Android.mk
index 3837176..3e14f77 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -33,7 +33,7 @@
 LOCAL_MODULE := libotafault
 LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs)
+LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
 
 include $(BUILD_STATIC_LIBRARY)
 

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 748d9c8..31c7de1 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -143,7 +143,6 @@
     libdivsufsort \
     libdivsufsort64 \
     libfs_mgr \
-    liblog \
     libvintf_recovery \
     libvintf \
     libtinyxml2 \
@@ -154,6 +153,7 @@
     libcrypto \
     libbz \
     libziparchive \
+    liblog \
     libutils \
     libz \
     libbase \