aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-09-29 12:14:17 -0500
committerandroid-build-merger2017-09-29 12:14:17 -0500
commit8277230a98fccdd5d7c5b0e5a38d20ae4cfa988b (patch)
treeb48e71ff2b8b9663ffd31a44f5a50701fe18ab5f
parentffc171c56d4056c1f8b8bb6b352a14924ff4f949 (diff)
parent50f5a54a1e2d8e2b2420853d34ec5dae1268e11e (diff)
downloadplatform-bootable-recovery-8277230a98fccdd5d7c5b0e5a38d20ae4cfa988b.tar.gz
platform-bootable-recovery-8277230a98fccdd5d7c5b0e5a38d20ae4cfa988b.tar.xz
platform-bootable-recovery-8277230a98fccdd5d7c5b0e5a38d20ae4cfa988b.zip
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."
am: 50f5a54a1e Change-Id: I4f2d63757bb122cd027627321c1ab66c5e9284b6
-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 59aa0ce6..f5dda2bc 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -112,11 +112,13 @@ LOCAL_C_INCLUDES := bootable/recovery
112LOCAL_STATIC_LIBRARIES := \ 112LOCAL_STATIC_LIBRARIES := \
113 libapplypatch_modes \ 113 libapplypatch_modes \
114 libapplypatch \ 114 libapplypatch \
115 libbase \
116 libedify \ 115 libedify \
117 libotafault \ 116 libotafault \
118 libcrypto \
119 libbspatch \ 117 libbspatch \
118 libbase \
119 libziparchive \
120 liblog \
121 libcrypto \
120 libbz 122 libbz
121LOCAL_SHARED_LIBRARIES := \ 123LOCAL_SHARED_LIBRARIES := \
122 libbase \ 124 libbase \
diff --git a/otafault/Android.mk b/otafault/Android.mk
index 38371761..3e14f77f 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -33,7 +33,7 @@ LOCAL_MODULE_TAGS := eng
33LOCAL_MODULE := libotafault 33LOCAL_MODULE := libotafault
34LOCAL_C_INCLUDES := bootable/recovery 34LOCAL_C_INCLUDES := bootable/recovery
35LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) 35LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
36LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs) 36LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
37 37
38include $(BUILD_STATIC_LIBRARY) 38include $(BUILD_STATIC_LIBRARY)
39 39
diff --git a/tests/Android.mk b/tests/Android.mk
index 748d9c87..31c7de17 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -143,7 +143,6 @@ LOCAL_STATIC_LIBRARIES := \
143 libdivsufsort \ 143 libdivsufsort \
144 libdivsufsort64 \ 144 libdivsufsort64 \
145 libfs_mgr \ 145 libfs_mgr \
146 liblog \
147 libvintf_recovery \ 146 libvintf_recovery \
148 libvintf \ 147 libvintf \
149 libtinyxml2 \ 148 libtinyxml2 \
@@ -154,6 +153,7 @@ LOCAL_STATIC_LIBRARIES := \
154 libcrypto \ 153 libcrypto \
155 libbz \ 154 libbz \
156 libziparchive \ 155 libziparchive \
156 liblog \
157 libutils \ 157 libutils \
158 libz \ 158 libz \
159 libbase \ 159 libbase \