aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-09-30 08:16:01 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-09-30 08:16:01 +0000
commit9a75b1c3032ce77e23de3378dd5eb1d5c46143f0 (patch)
tree8a53bd60614645277413e3594977dc16ba680ebe
parent45b3f6abb673742eca9793c8a511af1dc6a3008b (diff)
parent15c3b511780f92093ba1f8a74a2ea4bd0aba4441 (diff)
downloadandroid_external_libpng-9a75b1c3032ce77e23de3378dd5eb1d5c46143f0.tar.gz
android_external_libpng-9a75b1c3032ce77e23de3378dd5eb1d5c46143f0.tar.bz2
android_external_libpng-9a75b1c3032ce77e23de3378dd5eb1d5c46143f0.zip
release-request-b4bc7b84-64b6-4176-8f16-ce17068fad13-for-git_pi-release-4370135 snap-temp-L93500000107644030
Change-Id: I7768a77a589e2a14673547298018d1396de8bca6
-rw-r--r--Android.bp16
1 files changed, 2 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index 9f16bba..5df3b23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,19 +56,14 @@ cc_defaults {
// 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 @@ cc_test {
name: "pngtest",
shared_libs: [
"libpng",
+ "libz",
],
- target: {
- android: {
- shared_libs: ["libz"],
- },
- host: {
- shared_libs: ["libz-host"],
- },
- },
}