Merge "Reland "Remove Core Library JARs from `/system/framework`."" (6dc4d94f) · Commits · e / os / android_build

CleanSpec.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -695,6 +695,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-)
		# Switch to symlinks for VNDK libs
		$(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
		# ************************************************

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

+3 −5

Original line number	Diff line number	Diff line
		@@ -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