commit 0d375c657af3451f8b413e3d7d75f82a989f03e9
author Kelvin Zhang <zhangkelvin@google.com> Thu Jan 14 16:02:34 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 14 16:02:34 2021 +0000
tree b75ac96037bd015f7c84f77d4e835c8045f44bff
parent a88a07d8b95611e703be1704150dbd9a3052e7f2
parent 9997438c1cbf95d7b13befc8348a6af8c2ddc4f8

Switch imgdiff to use libz_stable am: 2f2749f213 am: 9997438c1c

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548316

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b8c94c5257f895f97544611fe0f9fd7cf1821f9

applypatch/Android.bp

diff --git a/applypatch/Android.bp b/applypatch/Android.bp
index 13a9625..80d8041 100644
--- a/applypatch/Android.bp
+++ b/applypatch/Android.bp
@@ -54,7 +54,7 @@
         "libbz",
         "libedify",
         "libotautil",
-        "libz",
+        "libz_stable",
     ],
 
     shared_libs: [
@@ -71,6 +71,7 @@
 cc_library_static {
     name: "libapplypatch_modes",
     vendor_available: true,
+    host_supported: true,
 
     defaults: [
         "applypatch_defaults",
@@ -95,6 +96,7 @@
 cc_binary {
     name: "applypatch",
     vendor: true,
+    host_supported: true,
 
     defaults: [
         "applypatch_defaults",
@@ -120,7 +122,7 @@
         "libbase",
         "libcrypto",
         "liblog",
-        "libz",
+        "libz_stable",
         "libziparchive",
     ],
 
@@ -129,9 +131,9 @@
     ],
 }
 
-cc_library_host_static {
+cc_library_static {
     name: "libimgdiff",
-
+    host_supported: true,
     defaults: [
         "applypatch_defaults",
     ],
@@ -152,14 +154,13 @@
         "liblog",
         "libotautil",
         "libutils",
-        "libz",
+        "libz_stable",
         "libziparchive",
     ],
 }
 
 cc_binary_host {
     name: "imgdiff",
-
     srcs: [
         "imgdiff_main.cpp",
     ],
@@ -180,6 +181,6 @@
         "liblog",
         "libbrotli",
         "libbz",
-        "libz",
+        "libz_stable",
     ],
 }

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 19f2a6c..d2179e4 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -31,7 +31,6 @@
         "libpng",
         "libprocessgroup",
         "libselinux",
-        "libz",
         "libziparchive",
     ],
 
@@ -65,7 +64,7 @@
     "libbase",
     "libbrotli",
     "libbz",
-    "libz",
+    "libz_stable",
     "libziparchive",
 ]