summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2020-05-19 02:56:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-19 02:56:08 +0000
commitf3e188e5135fda402834d6ef40c595bfd1c338a2 (patch)
tree75cef8a8e7b22298f291c2b30bb789d44fb98e53
parent8e3910f37427cdde100f742d6134404229439ca7 (diff)
parent912db88c1d89d011f68e9c4091e7f11382842836 (diff)
downloadzlib-f3e188e5135fda402834d6ef40c595bfd1c338a2.tar.gz
Set apex_available property am: 912db88c1d
Change-Id: Ic233c453526a14d006d14985c33586b099c495d7
-rw-r--r--Android.bp20
1 files changed, 14 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index c665c49..998c6b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -73,12 +73,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"],
@@ -115,6 +109,20 @@ 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: [
+ "com.android.extservices", // indirectly via libtextclassifier
+ ],
+}
+
ndk_library {
name: "libz",
symbol_file: "libz.map.txt",