diff options
| author | 2019-10-28 17:48:23 +0000 | |
|---|---|---|
| committer | 2019-10-28 17:48:23 +0000 | |
| commit | 5ec356acff6b57adf0980e8a32acf6cffb6e213c (patch) | |
| tree | 4dc39f40470cbd3dacc21e2161623b2a434bbc23 | |
| parent | 35815917ba3720c63fae30822d3da021751aa3ed (diff) | |
| parent | 7c39368927ca6226e6071a9f0613945ee0755268 (diff) | |
Merge "Revert "Remove Core Library JARs from `/system/framework`.""
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | target/product/runtime_libart.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/main.mk b/core/main.mk index a5e2456156..29c5a4ccb7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1253,8 +1253,6 @@ 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) diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index b8cb2ff097..581a72be52 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -20,6 +20,11 @@ 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 \ @@ -32,9 +37,6 @@ 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 |