commit 9721e7dd025a31245017f6d6bfe3fefd878e924e
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 05 23:24:20 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 05 23:24:21 2017 +0000
tree c344de7dfa9902f3f79d22987ca86b53812ee5b3
parent 86660d3b21364f2861831eb6e5ba36263fc0d6c1
parent 8ac48bcbb9ef98743aba403cd06e33ac304e5220

Merge "Use shared lib of libutils, libz and libbase."

libnativeloader/Android.bp

diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 9d33899..c1133fb 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -9,8 +9,8 @@
         "liblog",
         "libcutils",
         "libnativebridge",
+        "libbase",
     ],
-    static_libs: ["libbase"],
     target: {
         android: {
             shared_libs: ["libdl"],

libziparchive/Android.bp

diff --git a/libziparchive/Android.bp b/libziparchive/Android.bp
index 1495f39..44daf36 100644
--- a/libziparchive/Android.bp
+++ b/libziparchive/Android.bp
@@ -57,11 +57,13 @@
     name: "libziparchive",
     host_supported: true,
     defaults: ["libziparchive_defaults", "libziparchive_flags"],
-    static_libs: ["libutils"],
     shared_libs: ["liblog", "libbase"],
     target: {
         android: {
-            static_libs: ["libz"],
+            shared_libs: ["libz", "libutils"],
+        },
+        host: {
+            static_libs: ["libutils"],
         },
         linux_bionic: {
             static_libs: ["libz"],