Merge "Remove libz-host module" am: dac11656c6 am: af243f2743 am: d22b7e4487

am: 7725d4fb65

Change-Id: If849fe00a575479e22be26450a36cf75ba57a9a6

1 files changed, 11 insertions, 30 deletions

diff --git a/Android.bp b/Android.bp
index b4c50f5..403cf71 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,14 @@
-cc_defaults {
-    name: "zlib_defaults",
+cc_library {
+    name: "libz",
+
+    host_supported: true,
+    unique_host_soname: true,
+
+    vendor_available: true,
+    vndk: {
+        enabled: true,
+        support_system_process: true,
+    },
 
     cflags: [
         "-O3",
@@ -47,34 +56,6 @@ cc_defaults {
     },
 }
 
-cc_library {
-    name: "libz",
-    defaults: ["zlib_defaults"],
-
-    host_supported: true,
-    vendor_available: true,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
-
-    target: {
-        host: {
-            shared: {
-                // The host shared library is built as libz-host
-                enabled: false,
-            },
-        },
-    },
-}
-
-// Separate host shared library definition, since we don't want to conflict
-// with the host-supplied libz
-cc_library_host_shared {
-    name: "libz-host",
-    defaults: ["zlib_defaults"],
-}
-
 cc_binary_host {
     name: "minigzip",
     srcs: ["src/test/minigzip.c"],