(TM-MP) Rb back compat: Base changes (go/rbc-design) am: 4dd11643c3 am: 16c38202db

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tflite-support/+/21481779

Change-Id: I56a4f74c93c5abe49081cf14dfdb112983e74052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 11 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 598623f1..34cc018b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,8 +77,8 @@ cc_library_static {
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.extservices",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 
     visibility: ["//external/libtextclassifier:__subpackages__"],
@@ -100,6 +100,7 @@ java_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -131,6 +132,7 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -188,6 +190,7 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -209,6 +212,7 @@ java_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -257,6 +261,7 @@ cc_library_shared {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -273,6 +278,7 @@ java_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -304,6 +310,7 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -332,6 +339,7 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
@@ -443,6 +451,7 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }
 
diff --git a/third_party/zlib/Android.bp b/third_party/zlib/Android.bp
index 66386ac5..2da5f53c 100644
--- a/third_party/zlib/Android.bp
+++ b/third_party/zlib/Android.bp
@@ -223,5 +223,6 @@ cc_library_static {
     apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.extservices",
     ],
 }