commit c3912c8a2db109a15603554fd456f56cd0a69ad0
author Nicolas Geoffray <ngeoffray@google.com> Wed May 13 16:49:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 13 16:49:47 2015 +0000
tree 9fb9f7c2ec86951397cab437cc1c80d208629566
parent baaf28796dda318bd9c88bd0c1140a7ece3149d6
parent 0ad65a3c794b18101def5096d8ed151382c9d5aa

Merge "Remove junit from our core image."

build/Android.common_path.mk

diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index e0c0b0c..2d6b6a3 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -80,7 +80,7 @@
 TARGET_CORE_IMG_LOCATION := $(ART_TARGET_TEST_OUT)/core.art
 
 # Jar files for core.art.
-TARGET_CORE_JARS := core-libart conscrypt okhttp core-junit bouncycastle
+TARGET_CORE_JARS := core-libart conscrypt okhttp bouncycastle
 HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))
 
 HOST_CORE_DEX_LOCATIONS   := $(foreach jar,$(HOST_CORE_JARS),  $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index 17c4556..77e8004 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -22,7 +22,7 @@
 # Jar containing all the tests.
 test_jar=out/host/linux-x86/framework/apache-harmony-jdwp-tests-hostdex.jar
 
-if [ ! -f $test_jar -o ! -f $junit_jar ]; then
+if [ ! -f $test_jar ]; then
   echo "Before running, you must build jdwp tests and vogar:" \
        "make apache-harmony-jdwp-tests-hostdex vogar vogar.jar"
   exit 1