diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-29 09:31:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-29 09:31:10 +0000 |
| commit | 0efd17c961428eeffc206b9a3486a13a73623d1f (patch) | |
| tree | 8a53bd60614645277413e3594977dc16ba680ebe | |
| parent | 72c176484bc9117b569f6e5799edb66424b27644 (diff) | |
| parent | cd2ecdb9937be81636603d1296b1d186edfcb8bc (diff) | |
| download | libpng-0efd17c961428eeffc206b9a3486a13a73623d1f.tar.gz | |
Merge "Rename libz-host -> libz" am: 772123003e am: d12c507abf
am: cd2ecdb993
Change-Id: Iebd4ad7523bb6e7eb8e51bf2c68b7c53a1250195
| -rw-r--r-- | Android.bp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp index 9f16bbadc..5df3b2303 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"], - }, - }, } |