Snap for 6542793 from 7f4e3c2e0f582ba7739ac2d7501b5d8cbb14649c to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release

Change-Id: I4e52fc83e821e1988d2c7a5329d83c2423922025

1 files changed, 15 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 79e978d..a26de2e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",