commit b056d71f79b717fb36d375e48c19509900f977d3
author Bruce Beare <bruce.j.beare@intel.com> Thu Dec 01 12:46:12 2011 -0800
committer Jean-Baptiste Queru <jbq@google.com> Mon Dec 19 09:51:40 2011 -0800
tree 748fef08cf3896188b6e5f6a7d43fce92cb048e5
parent 6c2c5d8eec5e140ebedee7330988015df6aeb8bc

If setupwizard is disabled, don't force it to optional

Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

core/main.mk

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 @@
 
 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 ##