Rename libz-host -> libz
Also remove host_ldlibs, -lrt is in the default list for linux now. And
switch to always declaring shared_libs even for the static library. It's
functionally equivalent and reduces duplication.
Test: m host
Change-Id: I869b4d35361c607d647f6840cfd9c6655ef2afba
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,