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

Commit ffd1290c authored by Florian Mayer's avatar Florian Mayer Committed by Android (Google) Code Review
Browse files

Merge "Fix bug when memtag_heap in diag but not sanitizers" into udc-dev

parents 5b0c2964 0f79319b

core/config_sanitizers.mk

+7 −0
Original line number Diff line number Diff line
@@ -249,6 +249,13 @@ ifneq ($(filter memtag_heap memtag_stack,$(my_sanitize)),) 
  endif

endif



# Ignore SANITIZE_TARGET_DIAG=memtag_heap without SANITIZE_TARGET=memtag_heap

# This can happen if a condition above filters out memtag_heap from

# my_sanitize. It is easier to handle all of these cases here centrally.

ifneq ($(filter memtag_heap,$(my_sanitize_diag)),)

  my_sanitize_diag := $(filter-out memtag_heap,$(my_sanitize_diag))

endif



ifneq ($(filter memtag_heap,$(my_sanitize)),)

  my_cflags += -fsanitize=memtag-heap

  my_sanitize := $(filter-out memtag_heap,$(my_sanitize))