StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" am: 15c2fbfc18 am: 81dddafd1e am: 2a982e5b0d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1398272

Change-Id: Idb5c40bedf425739f0a4b198c7037d8b20ccbe73
This commit is contained in:
Treehugger Robot
2020-08-18 08:31:39 +00:00
committed by Automerger Merge Worker
parent e288469a00 2a982e5b0d
commit b919be051e
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/main.mk
View File

@@ -699,10 +699,23 @@ $(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))
check_missing_required_modules := true
ifneq (,$(filter true,$(ALLOW_MISSING_DEPENDENCIES) $(BUILD_BROKEN_MISSING_REQUIRED_MODULES)))
check_missing_required_modules :=
endif # ALLOW_MISSING_DEPENDENCIES == true || BUILD_BROKEN_MISSING_REQUIRED_MODULES == true
# Some executables are skipped in ASAN SANITIZE_TARGET build, thus breaking their dependencies.
ifneq (,$(filter address,$(SANITIZE_TARGET)))
check_missing_required_modules :=
endif # SANITIZE_TARGET has ASAN
# 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)))
# TODO(b/162102724): Remove this when darwin host has no broken dependency.
ifneq (,$(filter $(HOST_OS),darwin))
check_missing_required_modules :=
endif # HOST_OS == darwin
ifeq (true,$(check_missing_required_modules))
ifneq (,$(_nonexistent_required))
$(warning Missing required dependencies:)
$(foreach r_i,$(_nonexistent_required), \
@@ -712,8 +725,7 @@ ifneq (,$(_nonexistent_required))
$(warning Set BUILD_BROKEN_MISSING_REQUIRED_MODULES := true to bypass this check if this is intentional)
$(error Build failed)
endif # _nonexistent_required != empty
endif # ALLOW_MISSING_DEPENDENCIES != true && BUILD_BROKEN_MISSING_REQUIRED_MODULES != true
endif # HOST_OS != darwin
endif # check_missing_required_modules == true
define add-required-deps
$(1): | $(2)