Snap for 7405256 from 69521333be2976e23cec8490f062941414f29098 to sc-v2-release
Change-Id: Ic2345a5328414f69becdb07d59bb0e818f877bb6
diff --git a/apex/Android.bp b/apex/Android.bp
index 91d6b9b..ec8a964 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -70,6 +70,23 @@
apex_available: [
"com.android.i18n",
],
+ // The bootclasspath_fragments that provide APIs on which this depends.
+ fragments: [
+ {
+ apex: "com.android.art",
+ module: "art-bootclasspath-fragment",
+ },
+ ],
+ api: {
+ stub_libs: [
+ "i18n.module.public.api",
+ ],
+ },
+ core_platform_api: {
+ stub_libs: [
+ "legacy.i18n.module.platform.api",
+ ],
+ },
hidden_api: {
max_target_o_low_priority: [
"hiddenapi/hiddenapi-max-target-o-low-priority.txt",
@@ -83,9 +100,7 @@
host_supported: true,
target: {
android: {
- java_boot_libs: [
- "core-icu4j",
- ],
+ bootclasspath_fragments: ["i18n-bootclasspath-fragment"],
java_sdk_libs: [
"i18n.module.intra.core.api",
"legacy.i18n.module.platform.api",