From 30142ffc0aae89dd967c45d6762794e09a7e4625 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Wed, 20 Apr 2022 10:49:42 +0100 Subject: [PATCH] Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed. Bug: 170935728 Test: lunch aosp_cf_x86_64_phone-userdebug && m && lunch_cvd Change-Id: Icc50932228b6ce27799ac9ce9b2f637029436b6b --- core/dex_preopt_config.mk | 1 - core/dex_preopt_odex_install.mk | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index d5293cf697..c11b7f4193 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -96,7 +96,6 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(call add_json_list, DisablePreoptModules, $(DEXPREOPT_DISABLED_MODULES)) $(call add_json_bool, OnlyPreoptBootImageAndSystemServer, $(filter true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))) $(call add_json_bool, PreoptWithUpdatableBcp, $(filter true,$(DEX_PREOPT_WITH_UPDATABLE_BCP))) - $(call add_json_bool, UseArtImage, $(filter true,$(DEXPREOPT_USE_ART_IMAGE))) $(call add_json_bool, DontUncompressPrivAppsDex, $(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS))) $(call add_json_list, ModulesLoadedByPrivilegedModules, $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES)) $(call add_json_bool, HasSystemOther, $(BOARD_USES_SYSTEM_OTHER_ODEX)) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index ea50313264..216168b0af 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -272,11 +272,13 @@ my_dexpreopt_images := my_dexpreopt_images_deps := my_dexpreopt_image_locations_on_host := my_dexpreopt_image_locations_on_device := +# Infix can be 'boot' or 'art'. Soong creates a set of variables for Make, one +# for each boot image (primary and the framework extension). The only reason why +# the primary image is exposed to Make is testing (art gtests) and benchmarking +# (art golem benchmarks). Install rules that use those variables are in +# dex_preopt_libart.mk. Here for dexpreopt purposes the infix is always 'boot'. my_dexpreopt_infix := boot my_create_dexpreopt_config := -ifeq (true, $(DEXPREOPT_USE_ART_IMAGE)) - my_dexpreopt_infix := art -endif ifdef LOCAL_DEX_PREOPT ifeq (,$(filter PRESIGNED,$(LOCAL_CERTIFICATE)))