From 2f2749f2131775645f5eb8dcede90c6ea99cd469 Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Tue, 12 Jan 2021 14:42:56 -0500
Subject: Switch imgdiff to use libz_stable

libz contain platform dependent optimization flags, and sometimes that
cause reconstruction of blobs to fail. Use libz_stable instead

Bug: 177076632
Test: treehugger

Change-Id: I3a8c1591672537d1c754b2bc5b26f939dd80ed47
---
 applypatch/Android.bp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'applypatch/Android.bp')

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",
     ],
 }
-- 
cgit v1.2.3