tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Replace core-junit with legacy-test"

Browse source
This commit is contained in:
Paul Duffin 2016-12-01 10:34:07 +00:00 committed by Gerrit Code Review
commit 32cc1f80e5
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

@ -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

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/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 \

2
target/product/core_minimal.mk
View file

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

2
target/product/core_tiny.mk
View file

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

2
target/product/runtime_libart.mk
View file

@ -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 += \