commit 646b05a66c52502835d7c301b68b2ebfc4af7e41
author Tao Bao <tbao@google.com> Thu Sep 28 17:43:53 2017 -0700
committer Tao Bao <tbao@google.com> Thu Sep 28 18:25:10 2017 -0700
tree 0a97aff6c7f292ec42635f86bd52497c32f364e9
parent ac27a7a98733ea2444eedacfd2d8dd4a384726f6

otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES.

Commit d80a99883d5ae2b117c54f076fe1df7eae86d2f8 has explanation of
potential issues.

Test: mmma bootable/recovery
Change-Id: I25ca9920952b7bbdd8a661d9dc90962431410bc4

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 \