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

am: 1fcdb2709b

Change-Id: I285c95c4972e5fa39be55666de19d426edb226c6
This commit is contained in:
Tao Bao
2019-09-23 13:14:31 -07:00
committed by android-build-merger
2 changed files with 7 additions and 2 deletions
+3
View File
@@ -58,6 +58,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/testcases/recovery_component_test)
$(call add-clean-step, find $(OUT_DIR) -type f -name "SystemUpdaterSample*" -print0 | xargs -0 rm -f) $(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/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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************
+4 -2
View File
@@ -106,13 +106,15 @@ cc_binary {
"libapplypatch", "libapplypatch",
"libedify", "libedify",
"libotautil", "libotautil",
// External dependencies.
"libbspatch", "libbspatch",
"libbrotli",
"libbz",
], ],
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbrotli",
"libbz",
"libcrypto", "libcrypto",
"liblog", "liblog",
"libz", "libz",