Revert "Revert "ART: Fix up some multi-image cases""
This reverts commit de38b797c3e5ba3ee44c480db7093386975c51eb.
Fix up imgdiag for std::string and multi-image.
Bug: 26317072
Bug: 26320300
Change-Id: I94ce9528e9fea6fb3231a70c32db02d567143db9
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 840fffb..f29e51f 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -64,7 +64,8 @@
# with mksh.
art="bash ${OUT_DIR-out}/host/linux-x86/bin/art"
art_debugee="bash ${OUT_DIR-out}/host/linux-x86/bin/art"
- image="-Ximage:${ANDROID_BUILD_TOP}/${OUT_DIR-out}/host/linux-x86/framework/core-jit.art"
+ # We force generation of a new image to avoid build-time and run-time classpath differences.
+ image="-Ximage:/system/non/existent/vogar.art"
# We do not need a device directory on host.
device_dir=""
# Vogar knows which VM to use on host.