diff options
author | Ulya Trafimovich <skvadrik@google.com> | 2021-01-11 16:42:21 +0000 |
---|---|---|
committer | Anton Hansson <hansson@google.com> | 2021-01-12 15:43:46 +0000 |
commit | c8e4513fb03c8024f8e435643b8c5090af38ff69 (patch) | |
tree | 55219b43bd88ef25976fbeba75f02535ccd70da8 | |
parent | 04a80cd736b69c8419ca43fb939ff54773dc78c2 (diff) | |
download | build-c8e4513fb03c8024f8e435643b8c5090af38ff69.tar.gz |
Initialize DEX_PREOPT_DEFAULT based on global dexpreopt settings.
Bug: 177214554
Test: lunch cf_x86_phone-userdebug && m
Test: Ensure that `find out -name dexpreopt.config` lists before and
after the fix are identical (for target cf_x86_phone-userdebug).
Test: TARGET_PRODUCT=mainline_modules_x86_64 \
TARGET_BUILD_VARIANT=userdebug \
build/soong/soong_ui.bash --make-mode UipbUtil
Merged-In: I28b38c08ad570d53dc679f9b42975545d457416e
Change-Id: I28b38c08ad570d53dc679f9b42975545d457416e
(cherry picked from commit e245e00d7bf0db727958f14039efc043263e2d38)
-rw-r--r-- | core/dex_preopt_config.mk | 2 |
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>'. |