p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove Core Library JARs from `/system/framework`." 

am: 047f2fd43e

Change-Id: Ic25531c16a71452e659776765185adf8feac5eac
This commit is contained in:
Roland Levillain 2019-10-22 10:51:10 -07:00 committed by android-build-merger
parent fbdf5ef4df 047f2fd43e
commit e517577a45
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CleanSpec.mk
View File

@ -685,6 +685,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex)
# Migrate preopt files to system_other for some devices
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/*app/*/oat)
# Remove Android Core Library artifacts from the system partition, now
# that they live in the ART APEX (b/142944799).
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

2
core/main.mk
View File

@ -1253,6 +1253,8 @@ else
endef
endif
# TODO(b/142944799): Implement Java library absence check for Core Libraries.
ifdef FULL_BUILD
ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
# Check to ensure that all modules in PRODUCT_PACKAGES exist (opt in per product)

8
target/product/runtime_libart.mk
View File

@ -20,11 +20,6 @@ ifeq ($(TARGET_CORE_JARS),)
$(error TARGET_CORE_JARS is empty; cannot update PRODUCT_PACKAGES variable)
endif
# Minimal boot classpath. This should be a subset of PRODUCT_BOOT_JARS, and equivalent to
# TARGET_CORE_JARS.
PRODUCT_PACKAGES += \
$(TARGET_CORE_JARS)
# Additional mixins to the boot classpath.
PRODUCT_PACKAGES += \
android.test.base \
@ -37,6 +32,9 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += com.android.runtime
# ART APEX module.
# Note that this package includes the minimal boot classpath JARs (listed in
# TARGET_CORE_JARS), which should no longer be added directly to
# PRODUCT_PACKAGES.
PRODUCT_PACKAGES += com.android.art
PRODUCT_HOST_PACKAGES += com.android.art