diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-01-14 16:40:20 +0100 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-14 16:40:20 +0100 |
| commit | 9997438c1cbf95d7b13befc8348a6af8c2ddc4f8 (patch) | |
| tree | e3ca9b98257e85321b4cbeee1e7084eb65fb1b21 | |
| parent | Merge "Disable failed imgpatch tests" am: 043ef5ff40 (diff) | |
| parent | Switch imgdiff to use libz_stable (diff) | |
| download | android_bootable_recovery-9997438c1cbf95d7b13befc8348a6af8c2ddc4f8.tar android_bootable_recovery-9997438c1cbf95d7b13befc8348a6af8c2ddc4f8.tar.gz android_bootable_recovery-9997438c1cbf95d7b13befc8348a6af8c2ddc4f8.tar.bz2 android_bootable_recovery-9997438c1cbf95d7b13befc8348a6af8c2ddc4f8.tar.lz android_bootable_recovery-9997438c1cbf95d7b13befc8348a6af8c2ddc4f8.tar.xz android_bootable_recovery-9997438c1cbf95d7b13befc8348a6af8c2ddc4f8.tar.zst android_bootable_recovery-9997438c1cbf95d7b13befc8348a6af8c2ddc4f8.zip | |
| -rw-r--r-- | applypatch/Android.bp | 15 | ||||
| -rw-r--r-- | tests/Android.bp | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/applypatch/Android.bp b/applypatch/Android.bp index 13a962584..80d8041b1 100644 --- a/applypatch/Android.bp +++ b/applypatch/Android.bp @@ -54,7 +54,7 @@ cc_library_static { "libbz", "libedify", "libotautil", - "libz", + "libz_stable", ], shared_libs: [ @@ -71,6 +71,7 @@ cc_library_static { cc_library_static { name: "libapplypatch_modes", vendor_available: true, + host_supported: true, defaults: [ "applypatch_defaults", @@ -95,6 +96,7 @@ cc_library_static { cc_binary { name: "applypatch", vendor: true, + host_supported: true, defaults: [ "applypatch_defaults", @@ -120,7 +122,7 @@ cc_binary { "libbase", "libcrypto", "liblog", - "libz", + "libz_stable", "libziparchive", ], @@ -129,9 +131,9 @@ cc_binary { ], } -cc_library_host_static { +cc_library_static { name: "libimgdiff", - + host_supported: true, defaults: [ "applypatch_defaults", ], @@ -152,14 +154,13 @@ cc_library_host_static { "liblog", "libotautil", "libutils", - "libz", + "libz_stable", "libziparchive", ], } cc_binary_host { name: "imgdiff", - srcs: [ "imgdiff_main.cpp", ], @@ -180,6 +181,6 @@ cc_binary_host { "liblog", "libbrotli", "libbz", - "libz", + "libz_stable", ], } diff --git a/tests/Android.bp b/tests/Android.bp index 19f2a6c64..d2179e494 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -31,7 +31,6 @@ cc_defaults { "libpng", "libprocessgroup", "libselinux", - "libz", "libziparchive", ], @@ -65,7 +64,7 @@ libapplypatch_static_libs = [ "libbase", "libbrotli", "libbz", - "libz", + "libz_stable", "libziparchive", ] |