Duplicate small time zone files in runtime apex
Add the smaller time zone files into the runtime apex
in addition to /system so we can flush out issues and
start referring to the new location in code.
This doesn't remove anything from /system so should be
relatively safe.
ICU's file will be moved rather than duplicated because
it's a lot larger.
Bug: 119293618
Bug: 119390260
Bug: 113373927
Test: build only
Change-Id: I772842884e833cb9f7bba84bfce805a9b9180d88
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index f1a21e8..305616a 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -48,6 +48,13 @@
"libadbconnectiond",
]
+// Files associated with bionic / managed core library time zone APIs.
+art_runtime_time_zone_prebuilts = [
+ "apex_tz_version",
+ "apex_tzdata",
+ "apex_tzlookup.xml",
+]
+
// Modules listed in LOCAL_REQUIRED_MODULES for module art-tools in art/Android.mk.
art_tools_binaries = [
"dexdiag",
@@ -104,7 +111,8 @@
binaries: [],
}
},
- prebuilts: ["com.android.runtime.ld.config.txt"],
+ prebuilts: art_runtime_time_zone_prebuilts
+ + ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}
@@ -132,6 +140,7 @@
binaries: art_tools_binaries,
}
},
- prebuilts: ["com.android.runtime.ld.config.txt"],
+ prebuilts: art_runtime_time_zone_prebuilts
+ + ["com.android.runtime.ld.config.txt"],
key: "com.android.runtime.key",
}