Remove icu .dat file from Runtime module
Bug: 137009149
Bug: 130295968
Test: device boots
Test: m out/target/common/obj/JAVA_LIBRARIES/ahat-test-dump_intermediates/test-dump.hprof
Test: art/build/apex/runtests.sh fails due to bug 138103882
Test: art/tools/buildbot-build.sh
Test: m test-art-host-gtest
Change-Id: I0501fd6dd02dac3cf9780f5f1c0103e4b0475e1f
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 299456b..d72ad8d 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -81,11 +81,6 @@
"libopenjdkjvmtid",
]
-// Data files associated with bionic / managed core library APIs.
-art_runtime_data_file_prebuilts = [
- "apex_icu.dat",
-]
-
// Tools common to both device APEX and host APEX. Derived from art-tools in art/Android.mk.
art_tools_common_binaries = [
"dexdump",
@@ -240,10 +235,12 @@
"art_preinstall_hook_system_server",
"art_prepostinstall_utils",
],
- prebuilts: art_runtime_data_file_prebuilts +
- ["com.android.runtime.ld.config.txt"],
+ prebuilts: ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
- required: ["art_apex_boot_integrity"],
+ required: [
+ "art_apex_boot_integrity",
+ "com.android.i18n",
+ ],
}
// Default values shared by (device) Debug and Testing Runtime APEXes.