Revert "Add ICU's .dat to the runtime APEX"
This reverts commit 3b2319008cb95051dfeef3422c463db290fb0c23.
Reason for revert: Broke ART test environments and emulator devices.
Bug: 119293618
Change-Id: Ibad58feac6a919452d2da2437309e40d2480afcf
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 0847543..f2e12f6 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -48,12 +48,11 @@
"libadbconnectiond",
]
-// Data files associated with bionic / managed core library APIs.
-art_runtime_data_file_prebuilts = [
+// Files associated with bionic / managed core library time zone APIs.
+art_runtime_time_zone_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.
@@ -117,7 +116,7 @@
binaries: [],
}
},
- prebuilts: art_runtime_data_file_prebuilts
+ prebuilts: art_runtime_time_zone_prebuilts
+ ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}
@@ -146,7 +145,7 @@
binaries: art_tools_binaries,
}
},
- prebuilts: art_runtime_data_file_prebuilts
+ prebuilts: art_runtime_time_zone_prebuilts
+ ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}