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

Commit 382d8ae9 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Configure boot image profiles for platform and unbundled ART module... 

Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e

Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: I4f7a2e3c953e65d756f2eec9d7afdc033187682c
parents 6f017f5e f823ec6e

core/product.mk

+1 −1
Original line number Diff line number Diff line
@@ -275,10 +275,10 @@ _product_single_value_vars += PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING 
_product_single_value_vars += PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS



# Boot image options.

_product_list_vars += PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION

_product_single_value_vars += \

    PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST \

    PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE \

    PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \

    PRODUCT_USES_DEFAULT_ART_CONFIG \



_product_single_value_vars += PRODUCT_SYSTEM_SERVER_COMPILER_FILTER

target/product/default_art_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
# limitations under the License.

#



# This file contains product config for the ART module that is common for

# platform and unbundled builds.



ifeq ($(ART_APEX_JARS),)

  $(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)

endif
@@ -69,6 +72,8 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \ 
    com.android.media:service-media-s \

    com.android.permission:service-permission \



PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt



# Minimal configuration for running dex2oat (default argument values).

# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.

PRODUCT_USES_DEFAULT_ART_CONFIG := true

target/product/runtime_libart.mk

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    hiddenapi-package-whitelist.xml \



ifeq (,$(TARGET_BUILD_UNBUNDLED))

  # Don't depend on the framework boot image profile in unbundled builds where

  # frameworks/base may not be present.

  # TODO(b/179900989): We may not need this check once we stop using full

  # platform products on the thin ART manifest branch.

  PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += frameworks/base/boot/boot-image-profile.txt

endif



# The dalvik.vm.dexopt.thermal-cutoff property must contain one of the values

# listed here:

#