StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 21403dc2df

Change-Id: Ifebf2f1d380f48aaa5310e9cb14bc9efe85ac640
This commit is contained in:
Jiyong Park
2019-10-28 05:13:51 -07:00
committed by android-build-merger
parent 94870cc287 21403dc2df
commit 252f3bfbfb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/pdk_config.mk
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-libart_intermediates \
target/common/obj/JAVA_LIBRARIES/core-icu4j_intermediates \ target/common/obj/JAVA_LIBRARIES/core-icu4j_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-minus-apex_intermediates \
target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \ target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \
target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \ target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \
target/common/obj/JAVA_LIBRARIES/okhttp_intermediates \ target/common/obj/JAVA_LIBRARIES/okhttp_intermediates \

4
target/product/base_system.mk
View File

@@ -75,7 +75,7 @@ PRODUCT_PACKAGES += \
ExtServices \ ExtServices \
ExtShared \ ExtShared \
flags_health_check \ flags_health_check \
framework \ framework-minus-apex \
framework-res \ framework-res \
framework-sysconfig.xml \ framework-sysconfig.xml \
fsck_msdos \ fsck_msdos \
@@ -316,7 +316,7 @@ endif
# The order matters for runtime class lookup performance. # The order matters for runtime class lookup performance.
PRODUCT_BOOT_JARS := \ PRODUCT_BOOT_JARS := \
$(TARGET_CORE_JARS) \ $(TARGET_CORE_JARS) \
framework \ framework-minus-apex \
ext \ ext \
telephony-common \ telephony-common \
voip-common \ voip-common \