commit d94bfb014c62e4c8638e26aff4910b86ef182d9e
author Dan Willemsen <dwillemsen@google.com> Fri Sep 29 09:35:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 29 09:35:40 2017 +0000
tree 31b848bbf6f5e5eb43f6f5d4bc071d2ec253ef0d
parent b230e54a0e6d104a998825ebba6cd0bca591e926
parent 97828709f07909673237b2d80d77ff4fd117d0ab

Merge "Rename libz-host -> libz" am: 52e2821359 am: 4c1cccb5c4
am: 97828709f0

Change-Id: I593fd53509532c1dd1d032bdae9e3c0554eda355

ext4_utils/Android.bp

diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp
index 493fae5..7bc2f00 100644
--- a/ext4_utils/Android.bp
+++ b/ext4_utils/Android.bp
@@ -21,17 +21,14 @@
     export_include_dirs: ["include"],
     shared_libs: [
         "libsparse",
+        "libz",
     ],
 
     target: {
         host: {
             static_libs: ["libsparse"],
-            shared_libs: ["libz-host"],
         },
-        linux: {
-            static_libs: ["libselinux"],
-        },
-        darwin: {
+        not_windows: {
             static_libs: ["libselinux"],
         },
         windows: {
@@ -62,7 +59,6 @@
                 shared_libs: [
                     "libcutils",
                     "libext2_uuid",
-                    "libz",
                 ]
             },
         },