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

Commit 2af4c9b2 authored by Adam Wright's avatar Adam Wright
Browse files

Revert "Revert "Disable required modules check on darwin"" 

This reverts commit 66d6a268.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master-without-vendor&target=sdk_mac&lkgb=6753417&lkbb=6753939&fkbb=6753939, bug b/163524179.

Change-Id: Ied8faae2e18ff5f99a6b75f4fe2c61002e7cd981
parent 66d6a268

core/main.mk

+4 −0
Original line number Diff line number Diff line
@@ -703,6 +703,9 @@ $(call select-bitness-of-target-host-required-modules,TARGET,HOST) 
$(call select-bitness-of-target-host-required-modules,HOST,TARGET)

_nonexistent_required := $(sort $(_nonexistent_required))



# HOST OS darwin build is broken, disable this check for darwin for now.

# TODO(b/162102724): Remove this

ifeq (,$(filter $(HOST_OS),darwin))

ifeq (,$(filter true,$(ALLOW_MISSING_DEPENDENCIES) $(BUILD_BROKEN_MISSING_REQUIRED_MODULES)))

ifneq (,$(_nonexistent_required))

  $(warning Missing required dependencies:)
@@ -714,6 +717,7 @@ ifneq (,$(_nonexistent_required)) 
  $(error Build failed)

endif # _nonexistent_required != empty

endif # ALLOW_MISSING_DEPENDENCIES != true && BUILD_BROKEN_MISSING_REQUIRED_MODULES != true

endif # HOST_OS != darwin



define add-required-deps

$(1): | $(2)