Remove -testdex variants of bootclasspath jars.
These were used for device testing. Instead use the jars present in the
com.android.art.testing apex and com.android.conscrypt apex.
Test: run-libcore-tests, run-libjdwp-tests, run-tests
Change-Id: I29b5c0e32719ce05783b0860585f54d4a61adcc8
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 726b12d..7140b13 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -46,13 +46,13 @@
function boot_classpath_arg {
local dir="$1"
- local suffix="$2"
- shift 2
+ shift 1
printf -- "--vm-arg -Xbootclasspath"
for var
do
- printf -- ":${dir}/${var}${suffix}.jar";
+ printf -- ":${dir}/${var}.jar";
done
+ printf -- ":/apex/com.android.conscrypt/javalib/conscrypt.jar";
}
function usage {
@@ -147,7 +147,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 core-icu4j okhttp bouncycastle apache-xml"
DEPS="core-tests jsr166-tests mockito-target"
@@ -183,11 +183,9 @@
while [ -n "$1" ]; do
case "$1" in
--mode=device)
- # Use --mode=device_testdex not --mode=device for buildbot-build.sh.
- # See commit 191cae33c7c24e for more details.
- vogar_args="$vogar_args --mode=device_testdex"
+ vogar_args="$vogar_args --mode=device"
vogar_args="$vogar_args --vm-arg -Ximage:/data/art-test/core.art"
- vogar_args="$vogar_args $(boot_classpath_arg /system/framework -testdex $BOOT_CLASSPATH_JARS)"
+ vogar_args="$vogar_args $(boot_classpath_arg /apex/com.android.art/javalib $BOOT_CLASSPATH_JARS)"
execution_mode="device"
;;
--mode=host)