Revert "Allow boot image for a part of the boot classpath."
This reverts commit 4433c4351aab98005e12a6b53905678758b74665.
Reason for revert: May be breaking tests.
Change-Id: I3b690dbb06278dc1adce5a389fff938a692bdebd
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 63fe81b..63f1fce 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -57,10 +57,9 @@
done
}
-# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
+# Note: This must match the TEST_CORE_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-simple okhttp bouncycastle conscrypt"
+BOOT_CLASSPATH_JARS="core-oj core-libart core-simple conscrypt okhttp bouncycastle"
DEPS="core-tests jsr166-tests mockito-target"