Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b056d71f authored by Bruce Beare's avatar Bruce Beare Committed by Jean-Baptiste Queru
Browse files

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



Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: default avatarBruce Beare <bruce.j.beare@intel.com>
parent 6c2c5d8e

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 ##