Have the ART Buildbot and Golem generate timezones files in /system/etc/tz.
Have `tools/buildbot-build.sh --target` and Golem's target build
rule (`build-art-target-golem`) build targets `tzdata-art-test`,
`tzlookup.xml-art-test`, and `tz_version-art-test`, copying timezones
prebuilt files into /system/etc/tz, 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 the ART Buildbot fully
supports the Runtime APEX.
Test: Rely on the ART Buildbot and Golem.
Bug: 131667225
Bug: 121117762
Bug: 129332183
Bug: 119293618
Bug: 131239046
Change-Id: Ib9f748dea155b54eec0d000dd9e0f0dfb29ca626
diff --git a/Android.mk b/Android.mk
index 58b7363..1432a56 100644
--- a/Android.mk
+++ b/Android.mk
@@ -551,8 +551,8 @@
# directory under the build tree containing the (Debug) Runtime APEX
# artifacts, which is not sync'd to the target).
#
-# TODO(b/121117762): Remove this when the ART Buildbot and Golem have
-# full support for the Runtime APEX.
+# TODO(b/121117762, b/129332183): Remove this when the ART Buildbot
+# and Golem have full support for the Runtime APEX.
.PHONY: standalone-apex-files
standalone-apex-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker com.android.runtime.debug
for f in $(PRIVATE_BIONIC_FILES); do \
@@ -575,22 +575,28 @@
.PHONY: build-art-target-golem
# Also include libartbenchmark, we always include it when running golem.
# libstdc++ is needed when building for ART_TARGET_LINUX.
-#
+
# Also include the bootstrap Bionic libraries (libc, libdl, libm).
# These are required as the "main" libc, libdl, and libm have moved to
# the Runtime APEX. This is a temporary change needed until Golem
# fully supports the Runtime APEX.
-# TODO(b/121117762): Remove this when the ART Buildbot 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`), so that
-# it can 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.
-# TODO(b/121117762): Remove this when the ART Buildbot and Golem have
-# full support for the Runtime APEX.
+# TODO(b/121117762, b/129332183): Remove this when the ART Buildbot
+# 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`)
+# 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.
+#
+# TODO(b/121117762, b/129332183): Remove this when the ART Buildbot
+# and Golem have full support for the Runtime APEX.
ART_TARGET_SHARED_LIBRARY_BENCHMARK := $(TARGET_OUT_SHARED_LIBRARIES)/libartbenchmark.so
build-art-target-golem: dex2oat dalvikvm linker libstdc++ \
$(TARGET_OUT_EXECUTABLES)/art \
@@ -602,6 +608,7 @@
$(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 \
standalone-apex-files
# remove debug libraries from public.libraries.txt because golem builds
# won't have it.
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index d404466..5d9d787 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -89,8 +89,8 @@
# a temporary change needed until both the ART Buildbot and Golem fully
# support the Runtime APEX.
#
- # TODO(b/121117762): Remove this when the ART Buildbot and Golem have full
- # support for the Runtime APEX.
+ # TODO(b/121117762, b/129332183): Remove this when the ART Buildbot and Golem
+ # have full support for the Runtime APEX.
make_command+=" libc.bootstrap libdl.bootstrap libm.bootstrap"
# Create a copy of the ICU .dat prebuilt files in /system/etc/icu on target,
# so that it can found even if the Runtime APEX is not available, by setting
@@ -98,9 +98,18 @@
# device. This is a temporary change needed until both the ART Buildbot and
# Golem fully support the Runtime APEX.
#
- # TODO(b/121117762): Remove this when the ART Buildbot and Golem have full
- # support for the Runtime APEX.
+ # TODO(b/121117762, b/129332183): Remove this when the ART Buildbot and Golem
+ # have full support for the Runtime APEX.
make_command+=" icu-data-art-test"
+ # Create a copy of the timezones prebuilt files in /system/etc/tz on target,
+ # so that it 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 both the ART
+ # Buildbot and Golem fully support the Runtime APEX.
+ #
+ # TODO(b/121117762, b/129332183): Remove this when the ART Buildbot and Golem
+ # have full support for the Runtime APEX.
+ make_command+=" tzdata-art-test tzlookup.xml-art-test tz_version-art-test"
mode_suffix="-target"
fi
