Add sim of time zone data module files for target
Add a simulation of the time zone data mainline module for
some ART target test environments.
This change tracks a rename of build modules associated with
the runtime mainline module simulation (they now end in
-runtime).
It also adds the files to simulate the time zone data mainline
module by using new -tzdata build modules being added.
Bug: 132169989
Test: Ran ART tests and a subset of Libcore tests on host and device
Change-Id: I41e9bb86a6bfc23ed50f63620fa5813c4f582092
diff --git a/Android.mk b/Android.mk
index 2a2a03c..72b60e7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -600,15 +600,27 @@
# and Golem have full support for the Runtime APEX.
# Also include:
-# - a copy of the ICU .dat prebuilt files in /system/etc/icu on target
-# (see module `icu-data-art-test`); and
-# - a copy of the timezones prebuilt files in /system/etc/tz on
-# target, (see modules `tzdata-art-test`, `tzlookup.xml-art-test`,
-# and `tz_version-art-test`)
+# - a copy of the ICU prebuilt .dat file in /system/etc/icu on target
+# (see module `icu-data-art-test-runtime`); and
+# - a copy of the time zone data prebuilt files in /system/etc/tz on
+# target, (see modules `tzdata-art-test-runtime`,
+# `tzlookup.xml-art-test-runtime`, and `tz_version-art-test-runtime`)
# so that they can be found even if the Runtime APEX is not available,
# by setting the environment variable `ART_TEST_ANDROID_RUNTIME_ROOT`
-# to "/system" on device. This is a temporary change needed until
-# Golem fully supports the Runtime APEX.
+# to "/system" on device. This is a temporary change needed
+# until Golem fully supports the Runtime APEX.
+#
+# Also include:
+# - a copy of the time zone data prebuilt files in
+# /system/etc/tzdata_module/etc/tz and /system/etc/tzdata_module/etc/icu
+# on target, (see modules `tzdata-art-test-tzdata`,
+# `tzlookup.xml-art-test-tzdata`, and `tz_version-art-test-tzdata`, and
+# `icu_overlay-art-test-tzdata`)
+# so that they can be found even if the Time Zone Data APEX is not available,
+# by setting the environment variable `ART_TEST_ANDROID_TZDATA_ROOT`
+# to "/system/etc/tzdata_module" on device. This is a temporary change needed
+# until Golem fully supports the Time Zone Data APEX.
+
#
# TODO(b/121117762, b/129332183): Remove this when the ART Buildbot
# and Golem have full support for the Runtime APEX.
@@ -622,8 +634,11 @@
$(TARGET_CORE_IMG_OUT_BASE).art \
$(TARGET_CORE_IMG_OUT_BASE)-interpreter.art \
libc.bootstrap libdl.bootstrap libm.bootstrap \
- icu-data-art-test \
- tzdata-art-test tzlookup.xml-art-test tz_version-art-test \
+ icu-data-art-test-runtime \
+ tzdata-art-test-runtime tzlookup.xml-art-test-runtime \
+ tz_version-art-test-runtime \
+ tzdata-art-test-tzdata tzlookup.xml-art-test-tzdata \
+ tz_version-art-test-tzdata icu_overlay-art-test-tzdata \
standalone-apex-files
# remove debug libraries from public.libraries.txt because golem builds
# won't have it.