openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: ba57775354

Change-Id: If81ba7729c288b94a6fdaf7de9debba76b248ca6
This commit is contained in:
Paul Duffin 2016-12-01 11:00:47 +00:00 committed by android-build-merger
parent fd690886fd ba57775354
commit c039e0216f
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@ -697,7 +697,7 @@ endif
# allow overriding default Java libraries on a per-target basis # allow overriding default Java libraries on a per-target basis
ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),) 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 endif
# Flags for DEX2OAT # Flags for DEX2OAT

2
core/pdk_config.mk
View File

@ -17,7 +17,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \ target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \
target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \ target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \
target/common/obj/JAVA_LIBRARIES/core-libart_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/ext_intermediates \
target/common/obj/JAVA_LIBRARIES/framework_intermediates \ target/common/obj/JAVA_LIBRARIES/framework_intermediates \
target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \ target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \

2
target/product/core_minimal.mk
View File

@ -95,7 +95,7 @@ PRODUCT_BOOT_JARS := \
core-libart \ core-libart \
conscrypt \ conscrypt \
okhttp \ okhttp \
core-junit \ legacy-test \
bouncycastle \ bouncycastle \
ext \ ext \
framework \ framework \

2
target/product/core_tiny.mk
View File

@ -88,7 +88,7 @@ PRODUCT_BOOT_JARS := \
core-libart \ core-libart \
conscrypt \ conscrypt \
okhttp \ okhttp \
core-junit \ legacy-test \
bouncycastle \ bouncycastle \
ext \ ext \
framework \ framework \

2
target/product/runtime_libart.mk
View File

@ -28,7 +28,7 @@ PRODUCT_PACKAGES += \
# Additional mixins to the boot classpath. # Additional mixins to the boot classpath.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
core-junit \ legacy-test \
# Why are we pulling in ext, which is frameworks/base, depending on tagsoup and nist-sip? # Why are we pulling in ext, which is frameworks/base, depending on tagsoup and nist-sip?
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \