diff options
author | Jiyong Park <jiyong@google.com> | 2020-05-29 01:49:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-29 01:49:10 +0000 |
commit | 83fda04e5ad89925b4018d3e658ca8f41e7adac3 (patch) | |
tree | d141303ac2d0de4e3c5c7de0e0dbdcdce54421fb | |
parent | 2f2a03fea2229fe2461662cfd186033eda5f6e6a (diff) | |
parent | f644cb8f9afbae937628ad7ed5a288fc9ede940e (diff) | |
download | zlib-83fda04e5ad89925b4018d3e658ca8f41e7adac3.tar.gz |
Merge "Reland "Set apex_available property"" into rvc-devandroid11-dev
-rw-r--r-- | Android.bp | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -87,12 +87,6 @@ cc_library { ], } -cc_library_static { - name: "libz_current", - defaults: ["libz_defaults"], - sdk_version: "current", -} - cc_binary_host { name: "minigzip", srcs: ["contrib/minigzip/minigzip.c"], @@ -129,6 +123,21 @@ cc_binary { // license: "NOTICE", // } +// TODO(b/155351357) remove this library and let libtextclassifier to use libz +// instead. +// libz_current allows modules building against the NDK to have access to zlib +// API that's not available from the NDK libz. +cc_library_static { + name: "libz_current", + defaults: ["libz_defaults"], + sdk_version: "current", + + apex_available: [ + "//apex_available:platform", // indirectly from GoogleExtServices that gets installed to /system + "com.android.extservices", // indirectly via libtextclassifier + ], +} + ndk_library { name: "libz", symbol_file: "libz.map.txt", |