Merge changes Ib89ef776,I5cdc56c7 am: 2dcabab1c9
am: 02e56fc624
am: 9dbe41fe3c
Original change: https://android-review.googlesource.com/c/platform/build/+/1396214 Change-Id: Ie1e91212307bb7d1f4962b5d7a280beda2fa52b2
This commit is contained in:
@@ -697,6 +697,9 @@ $(call select-bitness-of-target-host-required-modules,TARGET,HOST)
|
|||||||
$(call select-bitness-of-target-host-required-modules,HOST,TARGET)
|
$(call select-bitness-of-target-host-required-modules,HOST,TARGET)
|
||||||
_nonexistent_required := $(sort $(_nonexistent_required))
|
_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)))
|
ifeq (,$(filter true,$(ALLOW_MISSING_DEPENDENCIES) $(BUILD_BROKEN_MISSING_REQUIRED_MODULES)))
|
||||||
ifneq (,$(_nonexistent_required))
|
ifneq (,$(_nonexistent_required))
|
||||||
$(warning Missing required dependencies:)
|
$(warning Missing required dependencies:)
|
||||||
@@ -708,6 +711,7 @@ ifneq (,$(_nonexistent_required))
|
|||||||
$(error Build failed)
|
$(error Build failed)
|
||||||
endif # _nonexistent_required != empty
|
endif # _nonexistent_required != empty
|
||||||
endif # ALLOW_MISSING_DEPENDENCIES != true && BUILD_BROKEN_MISSING_REQUIRED_MODULES != true
|
endif # ALLOW_MISSING_DEPENDENCIES != true && BUILD_BROKEN_MISSING_REQUIRED_MODULES != true
|
||||||
|
endif # HOST_OS != darwin
|
||||||
|
|
||||||
define add-required-deps
|
define add-required-deps
|
||||||
$(1): | $(2)
|
$(1): | $(2)
|
||||||
|
Reference in New Issue
Block a user