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

am: 5108b0b7f4

Change-Id: Ib112b7c8ecc533224459c045329a19e50e68f389
This commit is contained in:
Tao Bao 2019-09-23 13:08:30 -07:00 committed by android-build-merger
commit 1fcdb2709b
2 changed files with 7 additions and 2 deletions

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, 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
# ************************************************

View file

@ -106,13 +106,15 @@ cc_binary {
"libapplypatch",
"libedify",
"libotautil",
// External dependencies.
"libbspatch",
"libbrotli",
"libbz",
],
shared_libs: [
"libbase",
"libbrotli",
"libbz",
"libcrypto",
"liblog",
"libz",