commit de0118f803d8b712189b4374ee927d7f749d7c85
author Tao Bao <tbao@google.com> Wed Oct 11 19:06:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 11 19:06:07 2017 +0000
tree 4ccaa63e06d3f5b61b1e1cbd422d75b2bd9dae63
parent 08912cede57dfa4db34768e046da39c64154cce9
parent 9bfdc55472f8b2bfdbe79797014802826bc4c867

Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604 am: a3e032c549
am: 9bfdc55472

Change-Id: I2d4e65e2784f645c7c248cc01c3b60f21402d447

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 66494e6..c9ce34b 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -121,15 +121,13 @@
     libotafault \
     libotautil \
     libbspatch \
-    libbase \
-    libziparchive \
-    liblog \
-    libcrypto \
     libbz
 LOCAL_SHARED_LIBRARIES := \
     libbase \
+    libcrypto \
+    liblog \
     libz \
-    libcutils
+    libziparchive
 LOCAL_CFLAGS := -Wall -Werror
 include $(BUILD_EXECUTABLE)