Set apex_available property
The marked library(ies) were available to the APEXes via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.
Exempt-From-Owner-Approval: approved by enh
Bug: 150999716
Test: m
Merged-In: I022ce8459039c11f62d7f7f4e6e1a822489da953
Change-Id: I5a6070ad03768575c9b5980b3e03ddc3d222e119
diff --git a/Android.bp b/Android.bp
index c665c49..998c6b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -73,12 +73,6 @@
},
}
-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 @@
// 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",