commit 958fa02e97afe9316a2144199e43eef8f5fcb9b7
author Nicolas Geoffray <ngeoffray@google.com> Thu May 14 14:05:34 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu May 14 14:05:45 2015 +0000
tree 79db83efb8decdcc3b611fe613d50d8e6622a252
parent df09893c159f9314b832ddc1a6f0dfd374ef8a84

Revert "Revert "Remove junit from our core image.""

This reverts commit 7028d59fa70c7c8482975c4f9b42308c6959483b.

Change-Id: Ia005921af58595999b5b76001fbd16dfb484ab35

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)