commit 239bdf6a39e8ed1be3f7af227765e4f92ff47ac3
author Neil Fuller <nfuller@google.com> Mon Jan 08 18:55:36 2018 +0000
committer Neil Fuller <nfuller@google.com> Mon Jan 08 18:57:48 2018 +0000
tree e7878f9b4f19d9b29e4a8efe9c90f39b3542c0fb
parent 4b9a11f1d43df69c50e93ba1793fce1c2216682b

Remove Jack support from ART scripts

Test: ran run-libcore-tests.sh
Change-Id: Ida19b6db5b29dceafc6826252b0bf40dbd7633df

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 381c129..2cf614d 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -26,8 +26,6 @@
   ANDROID_HOST_OUT=${OUT_DIR-$ANDROID_BUILD_TOP/out}/host/linux-x86
 fi
 
-using_jack=$(get_build_var ANDROID_COMPILE_WITH_JACK)
-
 java_lib_location="${ANDROID_HOST_OUT}/../common/obj/JAVA_LIBRARIES"
 make_target_name="apache-harmony-jdwp-tests-hostdex"
 
@@ -184,7 +182,6 @@
 fi
 
 if [[ $mode == "ri" ]]; then
-  using_jack="false"
   if [[ "x$with_jdwp_path" != "x" ]]; then
     vm_args="${vm_args} --vm-arg -Djpda.settings.debuggeeAgentArgument=-agentpath:${agent_wrapper}"
     vm_args="${vm_args} --vm-arg -Djpda.settings.debuggeeAgentName=$with_jdwp_path"
@@ -225,10 +222,7 @@
   local str="classes"
   local suffix="jar"
   if [[ $mode == "ri" ]]; then
-    suffix="jar"
     str="javalib"
-  elif [[ $using_jack == "true" ]]; then
-    suffix="jack"
   fi
   echo "$path/$str.$suffix"
 }
@@ -290,9 +284,7 @@
   art_debugee="$art_debugee -verbose:jdwp"
 fi
 
-if [[ $using_jack == "true" ]]; then
-  toolchain_args="--toolchain jack --language JN --jack-arg -g"
-elif [[ $mode != "ri" ]]; then
+if [[ $mode != "ri" ]]; then
   toolchain_args="--toolchain d8 --language CUR"
 else
   toolchain_args="--toolchain javac --language CUR"

tools/run-libcore-tests.sh

diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 779620f..739646a 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -28,16 +28,10 @@
   JAVA_LIBRARIES=${ANDROID_PRODUCT_OUT}/../../common/obj/JAVA_LIBRARIES
 fi
 
-using_jack=$(get_build_var ANDROID_COMPILE_WITH_JACK)
-
 function classes_jar_path {
   local var="$1"
   local suffix="jar"
 
-  if [[ $using_jack == "true" ]]; then
-    suffix="jack"
-  fi
-
   echo "${JAVA_LIBRARIES}/${var}_intermediates/classes.${suffix}"
 }
 
@@ -145,12 +139,8 @@
 # the default timeout.
 vogar_args="$vogar_args --timeout 480"
 
-# Switch between using jack or javac+desugar+d8
-if [[ $using_jack == "true" ]]; then
-  vogar_args="$vogar_args --toolchain jack --language JO"
-else
-  vogar_args="$vogar_args --toolchain d8 --language CUR"
-fi
+# set the toolchain to use.
+vogar_args="$vogar_args --toolchain d8 --language CUR"
 
 # JIT settings.
 if $use_jit; then