summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/main.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk
index 569d4dc..b28b2f7 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -271,11 +271,13 @@ endif # !enable_target_debugging
ifeq ($(TARGET_BUILD_VARIANT),eng)
tags_to_install := user debug eng
+ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))),)
# Don't require the setup wizard on eng builds
ADDITIONAL_BUILD_PROPERTIES := $(filter-out ro.setupwizard.mode=%,\
$(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \
ro.setupwizard.mode=OPTIONAL
endif
+endif
## tests ##