tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Configure boot image profiles for platform and unbundled ART module"" am: 629ca86722 am: 575a363461

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1892419

Change-Id: I1e7aa79ee9fcd8eec93e6184fd24dc86a1be6272
This commit is contained in:
Martin Stjernholm 2021-11-15 20:49:36 +00:00 committed by Automerger Merge Worker
commit 7d836fa763
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
target/product/default_art_config.mk
View file

@ -14,9 +14,6 @@
# 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
@ -72,8 +69,6 @@ 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

8
target/product/runtime_libart.mk
View file

@ -75,14 +75,6 @@ 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:
#