Snap for 6507793 from f7fbbc73e1e1cb39000393b7e22fee8b6ec42d08 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: Id23fbc121fcbba5cf02f326d59787f5561c20974

6 files changed, 37 insertions, 0 deletions

diff --git a/android_icu4c/Android.bp b/android_icu4c/Android.bp
index dcae82cb9..0e3c3da1e 100644
--- a/android_icu4c/Android.bp
+++ b/android_icu4c/Android.bp
@@ -25,4 +25,10 @@ cc_library_headers {
             enabled: true,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index ce86961b0..329801643 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -98,6 +98,11 @@ java_library_static {
             "-Xep:ConstantOverflow:WARN", // Known constant overflow in SplittableRandom
         ],
     },
+
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
 }
 
 // A separated core library that contains ICU4J because ICU4J will be in a different APEX module,
diff --git a/icu4c/source/Android.bp b/icu4c/source/Android.bp
index d04f7d371..93c27639c 100644
--- a/icu4c/source/Android.bp
+++ b/icu4c/source/Android.bp
@@ -43,4 +43,9 @@ cc_library {
             ],
         },
     },
+
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
 }
diff --git a/icu4c/source/common/Android.bp b/icu4c/source/common/Android.bp
index c6f1dece5..502d1dd4e 100644
--- a/icu4c/source/common/Android.bp
+++ b/icu4c/source/common/Android.bp
@@ -71,6 +71,12 @@ cc_library_headers {
             enabled: true,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 //
@@ -103,4 +109,9 @@ cc_library {
     },
     header_libs: ["libicuuc_headers"],
     export_header_lib_headers: ["libicuuc_headers"],
+
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
diff --git a/icu4c/source/i18n/Android.bp b/icu4c/source/i18n/Android.bp
index 48ac41b89..bae2b9fe1 100644
--- a/icu4c/source/i18n/Android.bp
+++ b/icu4c/source/i18n/Android.bp
@@ -61,6 +61,11 @@ cc_library_headers {
             enabled: true,
         },
     },
+
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 //
diff --git a/libandroidicuinit/Android.bp b/libandroidicuinit/Android.bp
index 8345a64e9..32bb72d25 100644
--- a/libandroidicuinit/Android.bp
+++ b/libandroidicuinit/Android.bp
@@ -47,4 +47,9 @@ cc_library_static {
         "//external/icu/icu4c/source/test:__subpackages__",
         "//libcore",
     ],
+
+    apex_available: [
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
 }