diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2019-05-01 20:29:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-01 20:29:20 +0000 |
| commit | 3b77053daf3f6a09751db25009f1af056cd232c3 (patch) | |
| tree | 38e73e1d3f87d2ded05a977b058689607b55678e | |
| parent | 1739f234044b6b9d35041d68b45caebe32088038 (diff) | |
| parent | b9dc792b19a26879757d8825cdaad12d88efc286 (diff) | |
| download | build-3b77053daf3f6a09751db25009f1af056cd232c3.tar.gz | |
Merge "Add PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS"
| -rw-r--r-- | core/dex_preopt_config.mk | 1 | ||||
| -rw-r--r-- | core/product.mk | 1 |
2 files changed, 2 insertions, 0 deletions
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 += \ |