From 646b05a66c52502835d7c301b68b2ebfc4af7e41 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 28 Sep 2017 17:43:53 -0700
Subject: 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 | 6 ++++--
 otafault/Android.mk   | 2 +-
 tests/Android.mk      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 59aa0ce6c..f5dda2bc4 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -112,11 +112,13 @@ LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_STATIC_LIBRARIES := \
     libapplypatch_modes \
     libapplypatch \
-    libbase \
     libedify \
     libotafault \
-    libcrypto \
     libbspatch \
+    libbase \
+    libziparchive \
+    liblog \
+    libcrypto \
     libbz
 LOCAL_SHARED_LIBRARIES := \
     libbase \
diff --git a/otafault/Android.mk b/otafault/Android.mk
index 383717612..3e14f77f3 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -33,7 +33,7 @@ LOCAL_MODULE_TAGS := eng
 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)
 
diff --git a/tests/Android.mk b/tests/Android.mk
index 748d9c87b..31c7de177 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -143,7 +143,6 @@ LOCAL_STATIC_LIBRARIES := \
     libdivsufsort \
     libdivsufsort64 \
     libfs_mgr \
-    liblog \
     libvintf_recovery \
     libvintf \
     libtinyxml2 \
@@ -154,6 +153,7 @@ LOCAL_STATIC_LIBRARIES := \
     libcrypto \
     libbz \
     libziparchive \
+    liblog \
     libutils \
     libz \
     libbase \
-- 
cgit v1.2.3