commit 9a75b1c3032ce77e23de3378dd5eb1d5c46143f0
author android-build-team Robot <android-build-team-robot@google.com> Sat Sep 30 08:16:01 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Sep 30 08:16:01 2017 +0000
tree 8a53bd60614645277413e3594977dc16ba680ebe
parent 45b3f6abb673742eca9793c8a511af1dc6a3008b
parent 15c3b511780f92093ba1f8a74a2ea4bd0aba4441

release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370135 snap-temp-L93500000107644030

Change-Id: I7768a77a589e2a14673547298018d1396de8bca6

Android.bp

diff --git a/Android.bp b/Android.bp
index 9f16bba..5df3b23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,19 +56,14 @@
             // cflags: ["-DPNG_INTEL_SSE_OPT=1"],
         },
     },
+    shared_libs: ["libz"],
     target: {
-        android: {
-            shared_libs: ["libz"],
-        },
         android_x86: {
             cflags: ["-DPNG_INTEL_SSE_OPT=1"],
         },
         android_x86_64: {
             cflags: ["-DPNG_INTEL_SSE_OPT=1"],
         },
-        host: {
-            shared_libs: ["libz-host"],
-        },
     },
     export_include_dirs: ["."],
 }
@@ -113,13 +108,6 @@
     name: "pngtest",
     shared_libs: [
         "libpng",
+        "libz",
     ],
-    target: {
-        android: {
-            shared_libs: ["libz"],
-        },
-        host: {
-            shared_libs: ["libz-host"],
-        },
-    },
 }