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/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index 3545916..be1e832 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -175,7 +175,7 @@
// Environment variable ANDROID_RUNTIME_ROOT is set on the device, but not
// necessarily on the host. It needs to be set so that various libraries
- // like icu4c can find their data files.
+ // like libcore / icu4j / icu4c can find their data files.
const char* android_runtime_root_from_env = getenv("ANDROID_RUNTIME_ROOT");
if (android_runtime_root_from_env == nullptr) {
// Use ${ANDROID_HOST_OUT}/com.android.runtime for ANDROID_RUNTIME_ROOT.
@@ -186,7 +186,7 @@
// Environment variable ANDROID_TZDATA_ROOT is set on the device, but not
// necessarily on the host. It needs to be set so that various libraries
- // like icu4c can find their data files.
+ // like libcore / icu4j / icu4c can find their data files.
const char* android_tzdata_root_from_env = getenv("ANDROID_TZDATA_ROOT");
if (android_tzdata_root_from_env == nullptr) {
// Use ${ANDROID_HOST_OUT}/com.android.tzdata for ANDROID_TZDATA_ROOT.