diff options
| author | Tao Bao <tbao@google.com> | 2019-09-23 22:08:30 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-23 22:08:30 +0200 |
| commit | 1fcdb2709bede1a213ffa107c790eff17032630a (patch) | |
| tree | 71dc99c8da212791a023464d1a6f51d0b7ca086d | |
| parent | Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa (diff) | |
| parent | Merge "applypatch: Use static libs for libbrotli and libbz." (diff) | |
| download | android_bootable_recovery-1fcdb2709bede1a213ffa107c790eff17032630a.tar android_bootable_recovery-1fcdb2709bede1a213ffa107c790eff17032630a.tar.gz android_bootable_recovery-1fcdb2709bede1a213ffa107c790eff17032630a.tar.bz2 android_bootable_recovery-1fcdb2709bede1a213ffa107c790eff17032630a.tar.lz android_bootable_recovery-1fcdb2709bede1a213ffa107c790eff17032630a.tar.xz android_bootable_recovery-1fcdb2709bede1a213ffa107c790eff17032630a.tar.zst android_bootable_recovery-1fcdb2709bede1a213ffa107c790eff17032630a.zip | |
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | applypatch/Android.bp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 8405d20e1..0980a35f3 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/applypatch/Android.bp b/applypatch/Android.bp index ae7e9c5cc..55d185201 100644 --- a/applypatch/Android.bp +++ b/applypatch/Android.bp @@ -106,13 +106,15 @@ cc_binary { "libapplypatch", "libedify", "libotautil", + + // External dependencies. "libbspatch", + "libbrotli", + "libbz", ], shared_libs: [ "libbase", - "libbrotli", - "libbz", "libcrypto", "liblog", "libz", |