If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
This commit is contained in:
committed by
Jean-Baptiste Queru
parent
6c2c5d8eec
commit
b056d71f79
@@ -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 ##
|
||||
|
||||
|
Reference in New Issue
Block a user