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

Merge "Reland "Remove Core Library JARs from `/system/framework`."" am: 3596fc60c8 am: 6dc4d94f1f 

am: a3f6fa20aa

Change-Id: I67a86287a3bdc4cc61712ee9e40a0db52f2c8b75
This commit is contained in:
Roland Levillain 2019-10-31 06:34:11 -07:00 committed by android-build-merger
parent 41f5965cbf a3f6fa20aa
commit 275adbd65d
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

@ -700,6 +700,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*)
# Switch to symlinks for VNDK libs # Switch to symlinks for VNDK libs
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/vndk-*)
# Remove Android Core Library artifacts from the system partition
# again, as the original change removing them was reverted.
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

2
core/main.mk
View File

@ -1252,6 +1252,8 @@ else
endef endef
endif endif
# TODO(b/142944799): Implement Java library absence check for Core Libraries.
ifdef FULL_BUILD ifdef FULL_BUILD
ifneq (true,$(ALLOW_MISSING_DEPENDENCIES)) ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))
# Check to ensure that all modules in PRODUCT_PACKAGES exist (opt in per product) # 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) $(error TARGET_CORE_JARS is empty; cannot update PRODUCT_PACKAGES variable)
endif 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. # Additional mixins to the boot classpath.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.test.base \ android.test.base \
@ -37,6 +32,9 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += com.android.runtime PRODUCT_PACKAGES += com.android.runtime
# ART APEX module. # 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_PACKAGES += com.android.art
PRODUCT_HOST_PACKAGES += com.android.art PRODUCT_HOST_PACKAGES += com.android.art