StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b056d71f: If setupwizard is disabled, don\'t force it to optional

Browse Source 
* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
  If setupwizard is disabled, don't force it to optional
This commit is contained in:
Bruce Beare
2011-12-19 11:38:37 -08:00
committed by Android Git Automerger
parent dd7fce30df b056d71f79
commit cf0b20413e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/main.mk
View File

@@ -271,11 +271,13 @@ endif # !enable_target_debugging
ifeq ($(TARGET_BUILD_VARIANT),eng) ifeq ($(TARGET_BUILD_VARIANT),eng)
tags_to_install := user debug 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 # Don't require the setup wizard on eng builds
ADDITIONAL_BUILD_PROPERTIES := $(filter-out ro.setupwizard.mode=%,\ ADDITIONAL_BUILD_PROPERTIES := $(filter-out ro.setupwizard.mode=%,\
$(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \ $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \
ro.setupwizard.mode=OPTIONAL ro.setupwizard.mode=OPTIONAL
endif endif
endif
## tests ## ## tests ##