commit c275c68dfd9192682a69b8b113ba92823ad0fd11
author Ulyana Trafimovich <skvadrik@google.com> Tue Jan 12 10:12:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 12 10:12:14 2021 +0000
tree c012bd65f19bfbef2297901761138b8347d0852d
parent fe1d9d43362aab7e6f29088d02562db90510ee34
parent e245e00d7bf0db727958f14039efc043263e2d38

Merge "Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings."

core/dex_preopt_config.mk

diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index f72752c..1223694 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -10,7 +10,7 @@
 endif
 
 # 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>'.