commit fa6f4373d18562ab5cad6b88619c648cbc4452eb
author Jaekyun Seok <jaekyun@google.com> Thu Jan 05 23:39:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 05 23:39:16 2017 +0000
tree c775a27caf22e553dbe45b743f46fdf6c6088e7a
parent ed3b0353162adff1c09074890b484c9622ae8bf0
parent b7689eab7f58bb1604060e6ff0c9f547e3eab8b8

Merge "Use shared lib of libutils, libz and libbase." am: 4bf9c82857 am: 70f6d5878e am: 3b00f1cc8f
am: da100377b0

Change-Id: I947f7edc8e3ef3c56502387e2b764a3826244025

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"],