summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-09-29 19:16:01 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-09-29 19:16:01 +0200
commitd76a2e4c1422985aa9560b7ab53c47a8e8709064 (patch)
treeb48e71ff2b8b9663ffd31a44f5a50701fe18ab5f
parentMerge "otafault: Clean up header inclusion." am: d9373cf621 (diff)
parentMerge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." (diff)
downloadandroid_bootable_recovery-d76a2e4c1422985aa9560b7ab53c47a8e8709064.tar
android_bootable_recovery-d76a2e4c1422985aa9560b7ab53c47a8e8709064.tar.gz
android_bootable_recovery-d76a2e4c1422985aa9560b7ab53c47a8e8709064.tar.bz2
android_bootable_recovery-d76a2e4c1422985aa9560b7ab53c47a8e8709064.tar.lz
android_bootable_recovery-d76a2e4c1422985aa9560b7ab53c47a8e8709064.tar.xz
android_bootable_recovery-d76a2e4c1422985aa9560b7ab53c47a8e8709064.tar.zst
android_bootable_recovery-d76a2e4c1422985aa9560b7ab53c47a8e8709064.zip
Diffstat (limited to '')
-rw-r--r--applypatch/Android.mk6
-rw-r--r--otafault/Android.mk2
-rw-r--r--tests/Android.mk2
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 \