tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Remove Core Library JARs from /system/framework."" am: 5ec356acff

Browse source 
am: 8e3afe7ca4

Change-Id: Iea0fbe32dad214044bae722bb85a82bc472c961f
This commit is contained in:
Roland Levillain 2019-10-28 11:07:36 -07:00 committed by android-build-merger
commit c895f20422
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/main.mk
View file

@ -1253,8 +1253,6 @@ 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,6 +20,11 @@ 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 \
@ -32,9 +37,6 @@ 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