From 0ad65a3c794b18101def5096d8ed151382c9d5aa Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 13 May 2015 15:02:55 +0100 Subject: [PATCH] Remove junit from our core image. It's not used, and when we run art with vogar, we get incompatibilities. For example vogar's TestSuite class is very different than junit's TestSuite. Change-Id: I45c78d86c09c28b6136a6e50f6a08a746103794a --- build/Android.common_path.mk | 2 +- tools/run-jdwp-tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index e0c0b0c11..2d6b6a3cb 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -80,7 +80,7 @@ HOST_CORE_IMG_LOCATION := $(HOST_OUT_JAVA_LIBRARIES)/core.art 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) diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index 17c4556e4..77e800411 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -22,7 +22,7 @@ fi # 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 -- 2.11.0