diff options
| -rw-r--r-- | Android.mk | 7 | ||||
| -rwxr-xr-x | tools/buildbot-build.sh | 10 |
2 files changed, 1 insertions, 16 deletions
diff --git a/Android.mk b/Android.mk index 72b60e73512..dc0390e0719 100644 --- a/Android.mk +++ b/Android.mk @@ -602,10 +602,7 @@ standalone-apex-files: libc.bootstrap libdl.bootstrap libm.bootstrap linker com. # 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 @@ build-art-target-golem: dex2oat dalvikvm linker libstdc++ \ $(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 cf743b3e3b9..595d63a5f4e 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -101,16 +101,6 @@ elif [[ $mode == "target" ]]; then # 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 |