commit 6470f4fa996b83584da881ee41d6d49e2d6f7ff9
author Paul Duffin <paulduffin@google.com> Tue Nov 29 12:15:13 2016 +0000
committer Paul Duffin <paulduffin@google.com> Wed Nov 30 13:50:56 2016 +0000
tree f4fd46911b443ff44ba1d265712c2e9b339a021d
parent 2bbeae7f8ab3128a8112ec60c18dcfee07bb0506

Replace core-junit with legacy-test

m -j32 checkbuild cts droid
adb reboot bootloader
fastboot flashall -w
cts-tradefed run cts -m CtsLibcoreTestCases

Bug: 30188076
Test: As above
Change-Id: I2d49cb3c451cb265d026f9a700a61b3fc0d2ed82

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 677d210..f9d6e7e 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -696,7 +696,7 @@
 
 # allow overriding default Java libraries on a per-target basis
 ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
-  TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart core-junit ext framework okhttp
+  TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart legacy-test ext framework okhttp
 endif
 
 # Flags for DEX2OAT