Add ICU's .dat to the runtime APEX
Add ICU's .dat to the runtime APEX
There are associated changes in libcore
to reference the new location instead of /system.
There is an associated change in external/icu
to remove the /system copy of the file.
Bug: 119293618
Test: build / boot
Change-Id: I4400e5b3b6f92448117c8273fb649ec4cb03c6a1
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f2e12f6..0847543 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -48,11 +48,12 @@
"libadbconnectiond",
]
-// Files associated with bionic / managed core library time zone APIs.
-art_runtime_time_zone_prebuilts = [
+// Data files associated with bionic / managed core library APIs.
+art_runtime_data_file_prebuilts = [
"apex_tz_version",
"apex_tzdata",
"apex_tzlookup.xml",
+ "apex_icu.dat",
]
// Modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk.
@@ -116,7 +117,7 @@
binaries: [],
}
},
- prebuilts: art_runtime_time_zone_prebuilts
+ prebuilts: art_runtime_data_file_prebuilts
+ ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}
@@ -145,7 +146,7 @@
binaries: art_tools_binaries,
}
},
- prebuilts: art_runtime_time_zone_prebuilts
+ prebuilts: art_runtime_data_file_prebuilts
+ ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}