commit 3db3205b2ae760550fe93a0b50ae2656190d4844
author Tao Bao <tbao@google.com> Tue Oct 10 15:02:13 2017 -0700
committer Tao Bao <tbao@google.com> Tue Oct 10 15:34:49 2017 -0700
tree 03f844581bdbc7b27443091cfd9f418db6c3692c
parent eb8a064066aa4a8662896a0d37b84e9f8b3de0a6

applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive.

This reduces the size of /system/bin/applypatch by ~69KB
(aosp_bullhead-userdebug).

Also remove the unneeded libcutils dependency.

Test: mmma bootable/recovery
Test: Check that /system/bin/install-recovery.sh successfully installs
      the recovery image.
Change-Id: I5063be9a9b7b8029d45ab5c2a7c45ef2cda81d26

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 05d9370..5b92bad 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -111,7 +111,6 @@
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := applypatch_main.cpp
 LOCAL_MODULE := applypatch
-LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_STATIC_LIBRARIES := \
     libapplypatch_modes \
     libapplypatch \
@@ -119,15 +118,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)