From 50be66fedd7575c58f419f013b1499845a41112a Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Mon, 28 Dec 2015 14:31:06 -0800
Subject: [PATCH] ART: Remove core-junit from test boot classpath

Remove core-junit, which isn't used. Follow-up to commit
0ad65a3c794b18101def5096d8ed151382c9d5aa.

Change-Id: Ibac1c16e8b72688405dc59289dd22c1d9de69bb3
---
 test/118-noimage-dex2oat/run | 1 -
 test/run-test                | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/118-noimage-dex2oat/run b/test/118-noimage-dex2oat/run
index 4b1d0cea5..07bdb0878 100644
--- a/test/118-noimage-dex2oat/run
+++ b/test/118-noimage-dex2oat/run
@@ -41,7 +41,6 @@ fi
 bpath="${framework}/core-libart${bpath_suffix}.jar"
 bpath="${bpath}:${framework}/conscrypt${bpath_suffix}.jar"
 bpath="${bpath}:${framework}/okhttp${bpath_suffix}.jar"
-bpath="${bpath}:${framework}/core-junit${bpath_suffix}.jar"
 bpath="${bpath}:${framework}/bouncycastle${bpath_suffix}.jar"
 bpath_arg="--runtime-option -Xbootclasspath:${bpath}"
 
diff --git a/test/run-test b/test/run-test
index d07668726..ec34e0946 100755
--- a/test/run-test
+++ b/test/run-test
@@ -462,7 +462,7 @@ fi
 if [ "$runtime" = "dalvik" ]; then
     if [ "$target_mode" = "no" ]; then
         framework="${ANDROID_PRODUCT_OUT}/system/framework"
-        bpath="${framework}/core-libart.jar:${framework}/core-oj.jar:${framework}/conscrypt.jar:${framework}/okhttp.jar:${framework}/core-junit.jar:${framework}/bouncycastle.jar:${framework}/ext.jar"
+        bpath="${framework}/core-libart.jar:${framework}/core-oj.jar:${framework}/conscrypt.jar:${framework}/okhttp.jar:${framework}/bouncycastle.jar:${framework}/ext.jar"
         run_args="${run_args} --boot -Xbootclasspath:${bpath}"
     else
         true # defaults to using target BOOTCLASSPATH
@@ -509,7 +509,6 @@ if [ "$have_image" = "no" ]; then
     bpath="${bpath}:${framework}/core-oj${bpath_suffix}.jar"
     bpath="${bpath}:${framework}/conscrypt${bpath_suffix}.jar"
     bpath="${bpath}:${framework}/okhttp${bpath_suffix}.jar"
-    bpath="${bpath}:${framework}/core-junit${bpath_suffix}.jar"
     bpath="${bpath}:${framework}/bouncycastle${bpath_suffix}.jar"
     # Pass down the bootclasspath
     run_args="${run_args} --runtime-option -Xbootclasspath:${bpath}"
-- 
2.11.0