aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2021-01-12 15:44:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-01-12 15:44:57 +0000
commitb342684f5194ad4489af622e5c999d373e230720 (patch)
treeca0ed89ef0dff9a3c2ee48dc3e19e79759938f7f
parente900e6fd183f54b79db47d19461cd60f79d7777d (diff)
parentc8e4513fb03c8024f8e435643b8c5090af38ff69 (diff)
downloadbuild-b342684f5194ad4489af622e5c999d373e230720.tar.gz
Merge "Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings." into mainline-prod
-rw-r--r--core/dex_preopt_config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index ccf53f5229..c154f56bcf 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -1,7 +1,7 @@
DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt.config
# The default value for LOCAL_DEX_PREOPT
-DEX_PREOPT_DEFAULT ?= true
+DEX_PREOPT_DEFAULT ?= $(ENABLE_PREOPT)
# The default filter for which files go into the system_other image (if it is
# being used). Note that each pattern p here matches both '/<p>' and /system/<p>'.