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

Commit 252f3bfb authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Replace framework.jar with framework-minus-apex.jar" 

am: 21403dc2

Change-Id: Ifebf2f1d380f48aaa5310e9cb14bc9efe85ac640
parents 94870cc2 21403dc2

core/pdk_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ 
  target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \

  target/common/obj/JAVA_LIBRARIES/core-icu4j_intermediates \

  target/common/obj/JAVA_LIBRARIES/ext_intermediates \

  target/common/obj/JAVA_LIBRARIES/framework_intermediates \

  target/common/obj/JAVA_LIBRARIES/framework-minus-apex_intermediates \

  target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \

  target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \

  target/common/obj/JAVA_LIBRARIES/okhttp_intermediates \

target/product/base_system.mk

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ PRODUCT_PACKAGES += \ 
    ExtServices \

    ExtShared \

    flags_health_check \

    framework \

    framework-minus-apex \

    framework-res \

    framework-sysconfig.xml \

    fsck_msdos \
@@ -316,7 +316,7 @@ endif 
# The order matters for runtime class lookup performance.

PRODUCT_BOOT_JARS := \

    $(TARGET_CORE_JARS) \

    framework \

    framework-minus-apex \

    ext \

    telephony-common \

    voip-common \