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

Commit b919be05 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" am:... 

Merge "Bypass missing required module check on ASAN SANITIZE_TARGET build" am: 15c2fbfc am: 81dddafd am: 2a982e5b

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

Change-Id: Idb5c40bedf425739f0a4b198c7037d8b20ccbe73
parents e288469a 2a982e5b

core/main.mk

+17 −5
Original line number Diff line number Diff line
@@ -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)