"Move ICU from ART APEX to i18n APEX" Attempt 2
The change was previously submitted in https://r.android.com/1283897
"Calling @IntraCoreApi from core-icu4j should not cause Core platform API violation"
https://r.android.com/1299494
Bug: 138994281
Test: m checkbuild on aosp_x86-userdebug
Test: device boots
Change-Id: Idb3e2450fca5d8300aef353fc1e4e99e24f04372
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index f67e46d..062db09 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -42,6 +42,8 @@
do
if [ "$var" = "conscrypt" ] && [ "$mode" = "target" ]; then
printf -- "${separator}/apex/com.android.conscrypt/javalib/conscrypt.jar";
+ elif [ "$var" = "core-icu4j" ] && [ "$mode" = "target" ]; then
+ printf -- "${separator}/apex/com.android.i18n/javalib/core-icu4j.jar";
else
printf -- "${separator}${dir}/${var}${suffix}.jar";
fi
@@ -52,7 +54,7 @@
# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
# because that's what we use for compiling the core.art image.
# It may contain additional modules from TEST_CORE_JARS.
-BOOT_CLASSPATH_JARS="core-oj core-libart core-icu4j okhttp bouncycastle apache-xml conscrypt"
+BOOT_CLASSPATH_JARS="core-oj core-libart okhttp bouncycastle apache-xml core-icu4j conscrypt"
vm_args=""
art="$android_root/bin/art"