diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-27 16:13:37 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-09-27 16:13:45 -0700 |
| commit | 5728874fb9e2e3fa3ffea9286b89347048ffbe8b (patch) | |
| tree | 8a53bd60614645277413e3594977dc16ba680ebe | |
| parent | a80c5de7e9f205ae9a94fdd94521d0855bbaf091 (diff) | |
| download | libpng-5728874fb9e2e3fa3ffea9286b89347048ffbe8b.tar.gz | |
Rename libz-host -> libz
Test: m host
Change-Id: I0168975376a7baaa36e2370ad5a1e1b29e8316f2
| -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"], - }, - }, } |