commit 7c39368927ca6226e6071a9f0613945ee0755268
author Roland Levillain <rpl@google.com> Mon Oct 28 14:55:42 2019 +0000
committer Roland Levillain <rpl@google.com> Mon Oct 28 15:00:31 2019 +0000
tree 6d5eddc83f898b5128273569bb1afe4d517f0c13
parent 21403dc2df7a729db93e0d932a5355a5b96da6e2

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

This reverts commit 3ec9ff6b722febaeacd4f457c7ec92a56845fd81.

Reason for revert: This change breaks coverage builds (b/143304991)

Change-Id: Ia1a41ea75d1539efeb33b7cdea84516e402b6e00
Test: Device boot test
Test: Check that:
        export EMMA_INSTRUMENT=true
        && unset EMMA_INSTRUMENT_STATIC
        && m installclean
        && m systemimage
      generates a system image that contains these files:
        /system/framework/apex-jacocoagent.vdex
        /system/framework/boot-jacocoagent.vdex
        /system/framework/jacocoagent.jar
        /system/framework/<arch>/apex-jacocoagent.art
        /system/framework/<arch>/apex-jacocoagent.oat
        /system/framework/<arch>/apex-jacocoagent.vdex
        /system/framework/<arch>/boot-jacocoagent.art
        /system/framework/<arch>/boot-jacocoagent.oat
        /system/framework/<arch>/boot-jacocoagent.vdex
Test: Test: Run test ATP test avd/avd_boot_health_check on build target
      cf_x86_phone-userdebug_coverage
Bug: 142944799
Bug: 143304991

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index a5e2456..29c5a4c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1253,8 +1253,6 @@
   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)

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index b8cb2ff..581a72b 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -20,6 +20,11 @@
 $(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 += 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