commit e68c129c4413983ec95e1261b8133d3f77a0e45a
author Dan Willemsen <dwillemsen@google.com> Thu Sep 28 20:57:42 2017
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 28 20:57:42 2017
tree f68522c07fb9fb7ed5a8f03bd475141efea9a7eb
parent da30efac8863fdda3cefb9eff987fe5f710a8ec8
parent e93d073f0aee090e30663a99dc290a6d932b143f

Merge "Rename libz-host -> libz"

Android.bp

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