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.
This reverts commit a91d654ff358eeec6b10d344ffc3fa3508f8c229.
This is a reapply of commit 3b2319008cb95051dfeef3422c463db290fb0c23
Bug: 120853401
Bug: 119293618
Test: build / boot
Change-Id: I2e250795a58787b5b625c1cc68aa4bfffd11c6a8
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index e810595..fe23b80 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -44,11 +44,12 @@
"libjavacrypto",
]
-// 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",
}
@@ -146,7 +147,7 @@
binaries: art_tools_device_binaries,
}
},
- prebuilts: art_runtime_time_zone_prebuilts
+ prebuilts: art_runtime_data_file_prebuilts
+ ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}