Snap for 6507440 from 5a2f33f999bc4f5d8a13489c9a4f425e4968fc7f to rvc-release
Change-Id: I25cefa35b72b732c440e0f5c03028decd9696b44
diff --git a/android_icu4c/Android.bp b/android_icu4c/Android.bp
index dcae82c..0e3c3da 100644
--- a/android_icu4c/Android.bp
+++ b/android_icu4c/Android.bp
@@ -25,4 +25,10 @@
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 ce86961..3298016 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -98,6 +98,11 @@
"-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 d04f7d3..93c2763 100644
--- a/icu4c/source/Android.bp
+++ b/icu4c/source/Android.bp
@@ -43,4 +43,9 @@
],
},
},
+
+ 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 c6f1dec..502d1dd 100644
--- a/icu4c/source/common/Android.bp
+++ b/icu4c/source/common/Android.bp
@@ -71,6 +71,12 @@
enabled: true,
},
},
+
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.art.debug",
+ "com.android.art.release",
+ ],
}
//
@@ -103,4 +109,9 @@
},
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 48ac41b..bae2b9f 100644
--- a/icu4c/source/i18n/Android.bp
+++ b/icu4c/source/i18n/Android.bp
@@ -61,6 +61,11 @@
enabled: true,
},
},
+
+ apex_available: [
+ "com.android.art.debug",
+ "com.android.art.release",
+ ],
}
//
diff --git a/libandroidicuinit/Android.bp b/libandroidicuinit/Android.bp
index 8345a64..32bb72d 100644
--- a/libandroidicuinit/Android.bp
+++ b/libandroidicuinit/Android.bp
@@ -47,4 +47,9 @@
"//external/icu/icu4c/source/test:__subpackages__",
"//libcore",
],
+
+ apex_available: [
+ "com.android.art.release",
+ "com.android.art.debug",
+ ],
}
