From b9dc792b19a26879757d8825cdaad12d88efc286 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 29 Apr 2019 11:21:45 -0700 Subject: [PATCH] Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS For enabling per product configuration of resolving startup const strings. Bug: 130217075 Bug: 131310042 Test: make (cherry picked from commit b37c79c3a2512fe036f351df179af999d15a8afb) Merged-In: I51cb8931b915a710ab584f954b7a99c7a651d914 Change-Id: I0ecc7823620bca9f252b3d91b82982db91dd248d --- core/dex_preopt_config.mk | 1 + core/product.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index a494991047..b5834b08b3 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -111,6 +111,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(call add_json_bool, GenerateDmFiles, $(PRODUCT_DEX_PREOPT_GENERATE_DM_FILES)) $(call add_json_bool, NeverAllowStripping, $(PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING)) $(call add_json_bool, NoDebugInfo, $(filter false,$(WITH_DEXPREOPT_DEBUG_INFO))) + $(call add_json_bool, DontResolveStartupStrings, $(filter false,$(PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS))) $(call add_json_bool, AlwaysSystemServerDebugInfo, $(filter true,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO))) $(call add_json_bool, NeverSystemServerDebugInfo, $(filter false,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO))) $(call add_json_bool, AlwaysOtherDebugInfo, $(filter true,$(PRODUCT_OTHER_JAVA_DEBUG_INFO))) diff --git a/core/product.mk b/core/product.mk index 192d58c83f..f3c9a980a4 100644 --- a/core/product.mk +++ b/core/product.mk @@ -240,6 +240,7 @@ _product_var_list += PRODUCT_DEX_PREOPT_BOOT_FLAGS _product_var_list += PRODUCT_DEX_PREOPT_PROFILE_DIR _product_var_list += PRODUCT_DEX_PREOPT_GENERATE_DM_FILES _product_var_list += PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING +_product_var_list += PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS # Boot image options. _product_var_list += \