commit c33c087edca89693ed19d6ad4125741d92939e16
author Shubham Ajmera <shubhamajmera@google.com> Thu Jul 20 18:41:52 2017 -0700
committer Colin Cross <ccross@android.com> Mon Jul 24 21:48:59 2017 +0000
tree 7b7885df737ccf4934d35d90a1e3ff7360f8abf9
parent 914b7b6a6c9f399b26b41e9160e9871ef749e0db

Fix ART buildbots to use jdk8 prebuilts

Test: Manual
Bug: 63902894
Change-Id: I139e613df6efcabd5ca667d6d569cc7577e57355

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 225fb39..17c84b4 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -19,6 +19,11 @@
   exit 1
 fi
 
+if [ -z "$ANDROID_JAVA_TOOLCHAIN" ] ; then
+  source build/envsetup.sh
+  setpaths # include platform prebuilt java, javac, etc in $PATH.
+fi
+
 if [ -z "$ANDROID_HOST_OUT" ] ; then
   ANDROID_HOST_OUT=${OUT_DIR-$ANDROID_BUILD_TOP/out}/host/linux-x86
 fi