Remove unnecessary files from target test env
Remove unnecessary files from the simulation of the
runtime mainline module used in ART for on-device testing.
The files are being removed from the real runtime module
in a separate commit.
Bug: 132169989
Test: Run ART tests on device (in chroot environment)
Change-Id: I93f5720c6e110ffe555cc37eb4b8c5310fd6bb0d
diff --git a/Android.mk b/Android.mk
index 72b60e7..dc0390e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -602,10 +602,7 @@
# Also include:
# - 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,
+# 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 Golem fully supports the Runtime APEX.
@@ -635,8 +632,6 @@
$(TARGET_CORE_IMG_OUT_BASE)-interpreter.art \
libc.bootstrap libdl.bootstrap libm.bootstrap \
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
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index cf743b3..595d63a 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -101,16 +101,6 @@
# 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-runtime"
- # Create a copy of the runtime module prebuilt time zone data files in
- # /system/etc/tz on target, 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 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-runtime tzlookup.xml-art-test-runtime tz_version-art-test-runtime"
# Create a copy of the time zone data module prebuilt time zone data files in
# /system/etc/tzdata_module/etc on target, so that they can be found even if
# the Time Zone Data APEX is not available, by setting the environment