From 6470f4fa996b83584da881ee41d6d49e2d6f7ff9 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 29 Nov 2016 12:15:13 +0000 Subject: [PATCH] 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 | 2 +- core/pdk_config.mk | 2 +- target/product/core_minimal.mk | 2 +- target/product/core_tiny.mk | 2 +- target/product/runtime_libart.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/config.mk b/core/config.mk index 677d210d8d..f9d6e7e2a4 100644 --- a/core/config.mk +++ b/core/config.mk @@ -696,7 +696,7 @@ endif # 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 diff --git a/core/pdk_config.mk b/core/pdk_config.mk index c0aaacd928..8c986d6840 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -17,7 +17,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ 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 \ diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 04dc015dfc..63c516ab33 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -95,7 +95,7 @@ PRODUCT_BOOT_JARS := \ core-libart \ conscrypt \ okhttp \ - core-junit \ + legacy-test \ bouncycastle \ ext \ framework \ diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index ea70454b0d..ef8794d806 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -89,7 +89,7 @@ PRODUCT_BOOT_JARS := \ core-libart \ conscrypt \ okhttp \ - core-junit \ + legacy-test \ bouncycastle \ ext \ framework \ diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index fb75bff404..3dd505fdd6 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -28,7 +28,7 @@ PRODUCT_PACKAGES += \ # 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 += \