Reland "Set apex_available property"

This reverts commit 69a32df22aab9e05dc8553f52c2da28c6b9f3e2c.

Reason for revert: relanding

Exempt-From-Owner-Approval: approved by enh

Bug: 150999716
Test: m (on adt3)

Merged-In: I022ce8459039c11f62d7f7f4e6e1a822489da953
Change-Id: I3fef1b8b8b9e307d07e10cabcb7223ab878beb11

1 files changed, 15 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index c665c49..a51aa64 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,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",