Merge "Replace framework.jar with framework-minus-apex.jar" am: 21403dc2df am: 252f3bfbfb

am: 01fcd076fd

Change-Id: Id8a99e59e44b47ba2ee6522452d6e3a5295e07a7
This commit is contained in:
Jiyong Park 2019-10-28 05:25:49 -07:00 committed by android-build-merger
commit 8eb3787d71
2 changed files with 3 additions and 3 deletions

View file

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

View file

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