commit 6a078b757ab87e6ccbb36ba55f2d48615309cff9
author Dan Willemsen <dwillemsen@google.com> Fri Sep 29 10:07:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 29 10:07:47 2017 +0000
tree 116503a146fffede408aa8a6f11c329c0aaae199
parent d8dbf163c661ed4fb796dcb4c7756a1ef90536a4
parent cb584e1431dade580df3b16f32610a51b1c21cfe

Merge "Rename libz-host -> libz" am: 98b0d14797 am: d8a68223b1 am: 8e1f2377e3
am: cb584e1431

Change-Id: I154af8bca344b264bda409a56c87f30b56cdbd52

Android.bp

diff --git a/Android.bp b/Android.bp
index 61ccab4..4938592 100644
--- a/Android.bp
+++ b/Android.bp
@@ -188,37 +188,14 @@
         "lib/vtls/gskit.c",
         "lib/vtls/mbedtls.c",
     ],
-    shared: {
-        shared_libs: [
-            "libcrypto",
-            "libssl",
-        ],
-    },
-    static: {
-        static_libs: [
-            "libcrypto",
-            "libssl",
-            "libz",
-        ],
-    },
+    shared_libs: [
+        "libcrypto",
+        "libssl",
+        "libz",
+    ],
     target: {
         host: {
             cflags: ["-D_GNU_SOURCE=1"],
-            shared: {
-                shared_libs: [
-                    "libz-host",
-                ],
-            },
-        },
-        linux: {
-            host_ldlibs: ["-lrt"],
-        },
-        android: {
-            shared: {
-                shared_libs: [
-                    "libz",
-                ],
-            },
         },
     },
     unique_host_soname: true,