p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Adam Wright 2020-08-11 16:04:58 +00:00 committed by Android (Google) Code Review
parent 4d1100cce8 2af4c9b26f
commit 21d0d654ca
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@ -697,6 +697,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:)
@ -708,6 +711,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)