am b056d71f
: If setupwizard is disabled, don\'t force it to optional
* commit 'b056d71f79b717fb36d375e48c19509900f977d3': If setupwizard is disabled, don't force it to optional
This commit is contained in:
@@ -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