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

am: 3b00f1cc8f

Change-Id: I2b521fd2f7b275a10d230318189704730cac8f90

libnativeloader/Android.bp

@@ -9,8 +9,8 @@ cc_library {
         "liblog",
         "libcutils",
         "libnativebridge",
+        "libbase",
     ],
-    static_libs: ["libbase"],
     target: {
         android: {
             shared_libs: ["libdl"],

libziparchive/Android.bp

@@ -57,11 +57,13 @@ cc_library {
     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"],