diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-09-27 15:32:49 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2017-09-27 16:04:01 -0700 |
commit | 997963c796622a56ec427a61bc488e24c599277a (patch) | |
tree | 7d572f12cb058882de60a128162d0fc4d9450569 /Android.bp | |
parent | 0902bb9d09bcd155750b0e1cd6cad7dd1b3b1042 (diff) | |
download | zlib-997963c796622a56ec427a61bc488e24c599277a.tar.gz |
Remove libz-host module
We're always using our copy of libz, not the platform's copy anymore. So
always refer to it as libz. The host shared library will still be
libz-host.(so|dylib) because of unique_host_soname.
Test: m host
Change-Id: I4b0fb2b7f1e94834153b83f7a62b8a3e93c8d391
Diffstat (limited to 'Android.bp')
-rw-r--r-- | Android.bp | 41 |
1 files changed, 11 insertions, 30 deletions
@@ -1,5 +1,14 @@ -cc_defaults { - name: "zlib_defaults", +cc_library { + name: "libz", + + host_supported: true, + unique_host_soname: true, + + vendor_available: true, + vndk: { + enabled: true, + support_system_process: true, + }, cflags: [ "-O3", @@ -47,34 +56,6 @@ cc_defaults { }, } -cc_library { - name: "libz", - defaults: ["zlib_defaults"], - - host_supported: true, - vendor_available: true, - vndk: { - enabled: true, - support_system_process: true, - }, - - target: { - host: { - shared: { - // The host shared library is built as libz-host - enabled: false, - }, - }, - }, -} - -// Separate host shared library definition, since we don't want to conflict -// with the host-supplied libz -cc_library_host_shared { - name: "libz-host", - defaults: ["zlib_defaults"], -} - cc_binary_host { name: "minigzip", srcs: ["src/test/minigzip.c"], |