From 5cfa00605995b655fa652423cc5b60d29cae27a6 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 27 Sep 2017 16:24:45 -0700
Subject: [PATCH] Rename libz-host -> libz

Test: m host
Change-Id: Ib276431d13b3e1bd243f84a80f69aafc12e71aac
---
 libsparse/Android.bp     | 16 ++++------------
 libziparchive/Android.bp | 14 ++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/libsparse/Android.bp b/libsparse/Android.bp
index 6ec0991c7..b8946563c 100644
--- a/libsparse/Android.bp
+++ b/libsparse/Android.bp
@@ -15,19 +15,11 @@ cc_library {
     cflags: ["-Werror"],
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
+    shared_libs: [
+        "libz",
+        "libbase",
+    ],
     target: {
-        host: {
-            shared_libs: [
-                "libz-host",
-                "libbase",
-            ],
-        },
-        android: {
-            shared_libs: [
-                "libz",
-                "libbase",
-            ],
-        },
         windows: {
             enabled: true,
         },
diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index f395c7487..e3faee36c 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -69,11 +69,11 @@ cc_library {
     shared_libs: [
         "liblog",
         "libbase",
+        "libz",
     ],
     target: {
         android: {
             shared_libs: [
-                "libz",
                 "libutils",
             ],
         },
@@ -81,18 +81,8 @@ cc_library {
             static_libs: ["libutils"],
         },
         linux_bionic: {
-            static_libs: ["libz"],
             enabled: true,
         },
-        linux: {
-            shared_libs: ["libz-host"],
-        },
-        darwin: {
-            shared_libs: ["libz-host"],
-        },
-        windows: {
-            shared_libs: ["libz-host"],
-        },
     },
 }
 
@@ -105,7 +95,7 @@ cc_library {
         "libziparchive_defaults",
         "libziparchive_flags",
     ],
-    shared_libs: ["libz-host"],
+    shared_libs: ["libz"],
     static_libs: ["libutils"],
 }