Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32cc1f80 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Replace core-junit with legacy-test"

parents 9a3bd76a 6470f4fa

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/pdk_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \

target/product/core_minimal.mk

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ PRODUCT_BOOT_JARS := \ 
    core-libart \

    conscrypt \

    okhttp \

    core-junit \

    legacy-test \

    bouncycastle \

    ext \

    framework \

target/product/core_tiny.mk

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ PRODUCT_BOOT_JARS := \ 
    core-libart \

    conscrypt \

    okhttp \

    core-junit \

    legacy-test \

    bouncycastle \

    ext \

    framework \

target/product/runtime_libart.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 += \