Revert "Adjust build and test scripts for handling ICU prebuilts."
Revert "Remove ICU projects for master-art manifest."
Revert "Update mainline prebuilts to build 6608121."
Revert submission 1343524-art-use-icu-sdk
Bug: 157734636
Bug: 129332183
Reason for revert: Tests failing
Reverted Changes:
I8ae469ade:Adjust build and test scripts for handling ICU pre...
Ia0e5424cf:Remove ICU projects for master-art manifest.
I191a102d6:Update mainline prebuilts to build 6608121.
Change-Id: I40eb44a9de056636353e0e8225445c628581aea8
diff --git a/Android.mk b/Android.mk
index b2a0157..d8340bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -468,12 +468,8 @@
.PHONY: build-art
build-art: build-art-host build-art-target
-# For host, we extract the ICU data from the apex and install it to HOST_OUT/I18N_APEX.
.PHONY: build-art-host
-build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS) $(I18N_APEX) deapexer
- $(call extract-from-apex,$(I18N_APEX))
- mkdir -p $(HOST_OUT)/$(I18N_APEX)/
- cp -R $(TARGET_OUT)/apex/$(I18N_APEX)/etc/ $(HOST_OUT)/$(I18N_APEX)/
+build-art-host: $(HOST_OUT_EXECUTABLES)/art $(ART_HOST_DEPENDENCIES) $(HOST_CORE_IMG_OUTS)
.PHONY: build-art-target
build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TARGET_CORE_IMG_OUTS)
@@ -664,6 +660,16 @@
# ART APEX.
# Also include:
+# - a copy of the ICU prebuilt .dat file in /system/etc/icu on target
+# (see module `icu-data-art-test-i18n`); and
+# so that it can be found even if the ART APEX is not available, by setting the
+# environment variable `ART_TEST_ANDROID_ART_ROOT` to "/system" on device. This
+# is a temporary change needed until Golem fully supports the ART APEX.
+#
+# TODO(b/129332183): Remove this when Golem has full support for the
+# ART 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`,
@@ -685,6 +691,7 @@
$(ART_TARGET_SHARED_LIBRARY_BENCHMARK) \
libartpalette-system \
libc.bootstrap libdl.bootstrap libdl_android.bootstrap libm.bootstrap \
+ icu-data-art-test-i18n \
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/build/Android.common_path.mk b/build/Android.common_path.mk
index bcd5c62..54e337e 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -67,7 +67,7 @@
ART_CORE_SHARED_LIBRARIES := libjavacore libopenjdk libopenjdkjvm libopenjdkjvmti
ART_CORE_SHARED_DEBUG_LIBRARIES := libopenjdkd libopenjdkjvmd libopenjdkjvmtid
-ART_HOST_CORE_SHARED_LIBRARIES := $(ART_CORE_SHARED_LIBRARIES) libicuuc-host libicui18n-host libicu_jni
+ART_HOST_CORE_SHARED_LIBRARIES := $(ART_CORE_SHARED_LIBRARIES) libandroidicu-host libicuuc-host libicui18n-host libicu_jni
ART_HOST_SHARED_LIBRARY_DEPENDENCIES := $(foreach lib,$(ART_HOST_CORE_SHARED_LIBRARIES), $(ART_HOST_OUT_SHARED_LIBRARIES)/$(lib)$(ART_HOST_SHLIB_EXTENSION))
ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES := $(foreach lib,$(ART_CORE_SHARED_DEBUG_LIBRARIES), $(ART_HOST_OUT_SHARED_LIBRARIES)/$(lib)$(ART_HOST_SHLIB_EXTENSION))
ifdef HOST_2ND_ARCH
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 4719429..dc5015f 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -258,7 +258,7 @@
ifeq ($(ART_BUILD_TARGET),true)
$(foreach name,$(ART_TARGET_GTEST_NAMES), $(eval $(call add-art-gtest-dependencies,$(name),)))
ART_TEST_TARGET_GTEST_DEPENDENCIES += \
- com.android.i18n \
+ libicu_jni.com.android.i18n \
libjavacore.com.android.art.testing \
libopenjdkd.com.android.art.testing \
com.android.art.testing \
diff --git a/tools/bootjars.sh b/tools/bootjars.sh
index 6c39d31..5516bfb 100755
--- a/tools/bootjars.sh
+++ b/tools/bootjars.sh
@@ -113,12 +113,7 @@
if [[ $jar == "conscrypt" ]]; then
echo "$intermediates_dir/JAVA_LIBRARIES/${jar}.com.android.conscrypt_intermediates/classes.jar"
elif [[ $jar == "core-icu4j" ]]; then
- # The location of ICU is different on an unbundled build.
- if [[ -f "$intermediates_dir/JAVA_LIBRARIES/${jar}.com.android.i18n_intermediates/classes.jar" ]]; then
- echo "$intermediates_dir/JAVA_LIBRARIES/${jar}.com.android.i18n_intermediates/classes.jar"
- else
- echo "$intermediates_dir/JAVA_LIBRARIES/${jar}_intermediates/classes.jar"
- fi
+ echo "$intermediates_dir/JAVA_LIBRARIES/${jar}.com.android.i18n_intermediates/classes.jar"
else
echo "$intermediates_dir/JAVA_LIBRARIES/${jar}.com.android.art.testing_intermediates/classes.jar"
fi
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 5a6c0d7..9f2b9a8 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -86,8 +86,8 @@
make_command+=" libnetd_client-target toybox sh"
make_command+=" debuggerd su gdbserver"
make_command+=" libstdc++ "
- # vogar requires the class files for conscrypt and ICU.
- make_command+=" conscrypt core-icu4j"
+ # vogar requires the class files for conscrypt.
+ make_command+=" conscrypt "
make_command+=" ${ANDROID_PRODUCT_OUT#"${ANDROID_BUILD_TOP}/"}/system/etc/public.libraries.txt"
# Targets required to generate a linker configuration for device within the
# chroot environment. The *.libraries.txt targets are required by