Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ec356ac authored by Roland Levillain's avatar Roland Levillain Committed by Gerrit Code Review
Browse files

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

parents 35815917 7c393689

core/main.mk

+0 −2
Original line number Diff line number Diff line
@@ -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)

target/product/runtime_libart.mk

+5 −3
Original line number Diff line number Diff line
@@ -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