StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Stjernholm
2021-11-22 14:10:54 +00:00
committed by Gerrit Code Review
parent 1fb1088e88 91964c82e3
commit f823ec6e99
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -275,10 +275,10 @@ _product_single_value_vars += PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING
_product_single_value_vars += PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS _product_single_value_vars += PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS
# Boot image options. # Boot image options.
_product_list_vars += PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
_product_single_value_vars += \ _product_single_value_vars += \
PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST \ PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST \
PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE \ PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE \
PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \
PRODUCT_USES_DEFAULT_ART_CONFIG \ PRODUCT_USES_DEFAULT_ART_CONFIG \
_product_single_value_vars += PRODUCT_SYSTEM_SERVER_COMPILER_FILTER _product_single_value_vars += PRODUCT_SYSTEM_SERVER_COMPILER_FILTER

5
target/product/default_art_config.mk
View File

@@ -14,6 +14,9 @@
# limitations under the License. # 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),) ifeq ($(ART_APEX_JARS),)
$(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable) $(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
endif endif
@@ -69,6 +72,8 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \
com.android.media:service-media-s \ com.android.media:service-media-s \
com.android.permission:service-permission \ 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). # 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 must be true to enable boot image compilation.
PRODUCT_USES_DEFAULT_ART_CONFIG := true PRODUCT_USES_DEFAULT_ART_CONFIG := true

8
target/product/runtime_libart.mk
View File

@@ -75,6 +75,14 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
hiddenapi-package-whitelist.xml \ 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 # The dalvik.vm.dexopt.thermal-cutoff property must contain one of the values
# listed here: # listed here:
# #