tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."

Browse source 
am: 50f5a54a1e

Change-Id: I4f2d63757bb122cd027627321c1ab66c5e9284b6
This commit is contained in:
Tao Bao 2017-09-29 17:14:17 +00:00 committed by android-build-merger
commit 8277230a98
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applypatch/Android.mk
View file

@ -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 \

2
otafault/Android.mk
View file

@ -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)

2
tests/Android.mk
View file

@ -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 \