From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 27 Sep 2017 23:11:57 +0000 (-0700)
Subject: AOSP: Rename libz-host -> libz
X-Git-Tag: v1.44.0-rc1~19
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=367a90c91d37204cd399a5e22a21c52c281a0173;p=tools%2Fe2fsprogs.git

AOSP: Rename libz-host -> libz

Test: m host
Change-Id: I8b0edfe2076531bd4c4f1023b1076aec5f722a44
From AOSP commit: d4356bb606dbcad0b77788318c6199081262b373
---

diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp
index 18d3850..b4810a4 100644
--- a/contrib/android/Android.bp
+++ b/contrib/android/Android.bp
@@ -61,14 +61,6 @@ cc_binary {
         "libext2fs",
         "libext2_com_err",
         "libsparse",
+        "libz",
     ],
-
-    target: {
-        host: {
-            shared_libs: ["libz-host"],
-        },
-        android: {
-            shared_libs: ["libz"],
-        },
-    },
 }
diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp
index cc28de1..62bcba4 100644
--- a/lib/ext2fs/Android.bp
+++ b/lib/ext2fs/Android.bp
@@ -89,6 +89,7 @@ cc_library {
     ],
     shared_libs: [
         "libsparse",
+        "libz",
     ],
     whole_static_libs: [
         "libext2_com_err"
@@ -101,7 +102,6 @@ cc_library {
     ],
     target: {
         host: {
-            shared_libs: ["libz-host"],
             // Consider removing this library as a whole for the host. It is not
             // in the android side.
             whole_static_libs: ["libext2_com_err"],
@@ -110,7 +110,6 @@ cc_library {
             shared_libs: [
                 "libext2_com_err",
                 "libext2_uuid",
-                "libz"
             ],
         },
         windows: {