From a7e1611118bc498ff2ecc49d911a3415f269f7df Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Mon, 15 Nov 2021 17:15:05 +0000 Subject: [PATCH] Revert "Configure boot image profiles for platform and unbundled ART module" This reverts commit 1f925ed13eb0bdec4817e67620adef118e82f28a. Reason for revert: SH regressions in boot and app startup: b/206152027 Bug: 174746397 Bug: 206152027 Change-Id: I60f642b8e4dd8ea04248b835e5b76ffcf01ac300 --- target/product/default_art_config.mk | 5 ----- target/product/runtime_libart.mk | 8 -------- 2 files changed, 13 deletions(-) diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index e988d0067b..071edbfea6 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -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 diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 06b25d4cd8..301605aeb0 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -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: #