Revert "Add JIT"

Sorry, run-test crashes on target:
0-05 12:15:51.633 I/DEBUG   (27995): Abort message: 'art/runtime/mirror/art_method.cc:349] Check failed: PcIsWithinQuickCode(reinterpret_cast<uintptr_t>(code), pc) java.lang.Throwable java.lang.Throwable.fillInStackTrace() pc=71e3366b code=0x71e3362d size=ad000000'
10-05 12:15:51.633 I/DEBUG   (27995):     r0 00000000  r1 0000542b  r2 00000006  r3 00000000
10-05 12:15:51.633 I/DEBUG   (27995):     r4 00000006  r5 b6f9addc  r6 00000002  r7 0000010c
10-05 12:15:51.633 I/DEBUG   (27995):     r8 b63fe1e8  r9 be8e1418  sl b6427400  fp b63fcce0
10-05 12:15:51.633 I/DEBUG   (27995):     ip 0000542b  sp be8e1358  lr b6e9a27b  pc b6e9c280  cpsr 40070010
10-05 12:15:51.633 I/DEBUG   (27995): 

Bug: 17950037
This reverts commit 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4.

Change-Id: I6f88849bc6f2befed0c0aaa0b7b2a08c967a83c3

4 files changed, 2 insertions, 31 deletions

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 49ad1de3ce..c8e0ec5216 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -84,9 +84,6 @@ endif
 ifeq ($(ART_TEST_INTERPRETER),true)
   COMPILER_TYPES += interpreter
 endif
-ifeq ($(ART_TEST_JIT),true)
-  COMPILER_TYPES += jit
-endif
 ifeq ($(ART_TEST_OPTIMIZING),true)
   COMPILER_TYPES += optimizing
 endif
@@ -499,12 +496,7 @@ define define-test-art-run-test
         test_groups += ART_RUN_TEST_$$(uc_host_or_target)_DEFAULT_RULES
         run_test_options += --quick
       else
-        ifeq ($(4),jit)
-          test_groups += ART_RUN_TEST_$$(uc_host_or_target)_DEFAULT_RULES
-          run_test_options += --jit
-        else
-          $$(error found $(4) expected $(COMPILER_TYPES))
-        endif
+        $$(error found $(4) expected $(COMPILER_TYPES))
       endif
     endif
   endif
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index ee40ee8310..f64756b5de 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -26,7 +26,6 @@ GDB_SERVER="gdbserver"
 HAVE_IMAGE="y"
 HOST="n"
 INTERPRETER="n"
-JIT="n"
 INVOKE_WITH=""
 ISA=x86
 LIBRARY_DIRECTORY="lib"
@@ -128,9 +127,6 @@ while true; do
     elif [ "x$1" = "x--interpreter" ]; then
         INTERPRETER="y"
         shift
-    elif [ "x$1" = "x--jit" ]; then
-        JIT="y"
-        shift
     elif [ "x$1" = "x--jvm" ]; then
         USE_JVM="y"
         shift
@@ -264,16 +260,6 @@ if [ "$INTERPRETER" = "y" ]; then
     fi
 fi
 
-if [ "$JIT" = "y" ]; then
-    INT_OPTS="-Xjit"
-    if [ "$VERIFY" = "y" ] ; then
-      COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=interpret-only"
-    else
-      COMPILE_FLAGS="${COMPILE_FLAGS} --compiler-filter=verify-none"
-      DEX_VERIFY="${DEX_VERIFY} -Xverify:none"
-    fi
-fi
-
 JNI_OPTS="-Xjnigreflimit:512 -Xcheck:jni"
 
 if [ "$RELOCATE" = "y" ]; then
diff --git a/test/run-all-tests b/test/run-all-tests
index d0b3cf9abe..318a0de17e 100755
--- a/test/run-all-tests
+++ b/test/run-all-tests
@@ -53,9 +53,6 @@ while true; do
     elif [ "x$1" = "x--interpreter" ]; then
         run_args="${run_args} --interpreter"
         shift
-    elif [ "x$1" = "x--jit" ]; then
-        run_args="${run_args} --jit"
-        shift
     elif [ "x$1" = "x--no-verify" ]; then
         run_args="${run_args} --no-verify"
         shift
@@ -129,7 +126,7 @@ if [ "$usage" = "yes" ]; then
         echo "  $prog [options]  Run all tests with the given options."
         echo "  Options are all passed to run-test; refer to that for " \
              "further documentation:"
-        echo "    --debug --dev --host --interpreter --jit --jvm --no-optimize"
+        echo "    --debug --dev --host --interpreter --jvm --no-optimize"
         echo "    --no-verify -O --update --valgrind --zygote --64 --relocate"
         echo "    --prebuild --always-clean --gcstress --gcverify --trace"
         echo "    --no-patchoat --no-dex2oat"
diff --git a/test/run-test b/test/run-test
index 8bc4151941..8c47663390 100755
--- a/test/run-test
+++ b/test/run-test
@@ -193,9 +193,6 @@ while true; do
         run_args="${run_args} --interpreter"
         image_suffix="-interpreter"
         shift
-    elif [ "x$1" = "x--jit" ]; then
-        run_args="${run_args} --jit"
-        shift
     elif [ "x$1" = "x--optimizing" ]; then
         run_args="${run_args} -Xcompiler-option --compiler-backend=Optimizing"
         image_suffix="-optimizing"
@@ -433,7 +430,6 @@ if [ "$usage" = "yes" ]; then
         echo "    --gdb                 Run under gdb; incompatible with some tests."
         echo "    --build-only          Build test files only (off by default)."
         echo "    --interpreter         Enable interpreter only mode (off by default)."
-        echo "    --jit                 Enable jit (off by default)."
         echo "    --optimizing          Enable optimizing compiler (off by default)."
         echo "    --quick               Use Quick compiler (default)."
         echo "    --no-verify           Turn off verification (on by default)."