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

Merge changes Ib89ef776,I5cdc56c7 am: 2dcabab1c9 am: 02e56fc624 am: 9dbe41fe3c am: 2e5f7295f4 

Original change: https://android-review.googlesource.com/c/platform/build/+/1396214

Change-Id: Id8f6428ebca97ef6b141274c4ca2b3b5b112a504
This commit is contained in:
Yo Chiang 2020-08-12 05:07:45 +00:00 committed by Automerger Merge Worker
parent 142f7f4a5b 2e5f7295f4
commit 6b1023b024
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)