commit 1fcdb2709bede1a213ffa107c790eff17032630a
author Tao Bao <tbao@google.com> Mon Sep 23 13:08:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 23 13:08:30 2019 -0700
tree 71dc99c8da212791a023464d1a6f51d0b7ca086d
parent 7b72231ffada3f79ef2ae570b166050014f989a6
parent 5108b0b7f4ad3eedcdfab9547e833fac51f4fe72

Merge "applypatch: Use static libs for libbrotli and libbz." am: 4f86af7b9a
am: 5108b0b7f4

Change-Id: Ib112b7c8ecc533224459c045329a19e50e68f389

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 8405d20..0980a35 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -58,6 +58,9 @@
 $(call add-clean-step, find $(OUT_DIR) -type f -name "SystemUpdaterSample*" -print0 | xargs -0 rm -f)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUpdaterSample)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libbrotli.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libbz.so)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

applypatch/Android.bp

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index ae7e9c5..55d1852 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -106,13 +106,15 @@
         "libapplypatch",
         "libedify",
         "libotautil",
+
+        // External dependencies.
         "libbspatch",
+        "libbrotli",
+        "libbz",
     ],
 
     shared_libs: [
         "libbase",
-        "libbrotli",
-        "libbz",
         "libcrypto",
         "liblog",
         "libz",