Rename libz-host -> libz
Also remove host_ldlibs -lpthread, which is a default now.
Test: m host
Change-Id: Ifee46f2f2aaf158329fca207fcc9198e27926a68
diff --git a/Android.bp b/Android.bp
index 7545459..f88938e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -214,12 +214,10 @@
srcs: protobuf_cc_full_src_files,
cflags: ["-DGOOGLE_PROTOBUF_NO_RTTI"],
+ shared_libs: ["libz"],
target: {
android: {
- shared_libs: ["libz", "liblog"],
- },
- host: {
- shared_libs: ["libz-host"],
+ shared_libs: ["liblog"],
},
},
}
@@ -234,12 +232,10 @@
srcs: protobuf_cc_full_src_files,
rtti: true,
+ shared_libs: ["libz"],
target: {
android: {
- shared_libs: ["libz", "liblog"],
- },
- host: {
- shared_libs: ["libz-host"],
+ shared_libs: ["liblog"],
},
},
}
@@ -261,7 +257,7 @@
rtti: true,
- shared_libs: ["libz-host"],
+ shared_libs: ["libz"],
}
// Android Protocol buffer compiler, aprotoc (host executable)
@@ -275,9 +271,6 @@
windows: {
enabled: true,
},
- not_windows: {
- host_ldlibs: ["-lpthread"],
- },
},
// Statically link libc++ because we copy aprotoc to unbundled projects where