commit c039e0216fd96b5f4b9fb466c9b024049c94bd92
author Paul Duffin <paulduffin@google.com> Thu Dec 01 11:00:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 01 11:00:47 2016 +0000
tree 95d57bff23f6e3388df0cbf20e65ba231974d487
parent fd690886fdb5a5344fb8abc91ddf50e8517dfcbf
parent ba577753545735870dc215ce44f7353d8b2257dc

Merge "Replace core-junit with legacy-test" am: 32cc1f80e5 am: 74f8ee05de am: 29a72d0e22
am: ba57775354

Change-Id: If81ba7729c288b94a6fdaf7de9debba76b248ca6

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index f2ba6e6..1c21143 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -697,7 +697,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

core/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index c0aaacd..8c986d6 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -17,7 +17,7 @@
   target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \
   target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \
   target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \
-  target/common/obj/JAVA_LIBRARIES/core-junit_intermediates \
+  target/common/obj/JAVA_LIBRARIES/legacy-test_intermediates \
   target/common/obj/JAVA_LIBRARIES/ext_intermediates \
   target/common/obj/JAVA_LIBRARIES/framework_intermediates \
   target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 04dc015..63c516a 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -95,7 +95,7 @@
     core-libart \
     conscrypt \
     okhttp \
-    core-junit \
+    legacy-test \
     bouncycastle \
     ext \
     framework \

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index a9fdb5c..52cb449 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -88,7 +88,7 @@
     core-libart \
     conscrypt \
     okhttp \
-    core-junit \
+    legacy-test \
     bouncycastle \
     ext \
     framework \

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index fb75bff..3dd505f 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -28,7 +28,7 @@
 
 # Additional mixins to the boot classpath.
 PRODUCT_PACKAGES += \
-    core-junit \
+    legacy-test \
 
 # Why are we pulling in ext, which is frameworks/base, depending on tagsoup and nist-sip?
 PRODUCT_PACKAGES += \