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

Commit 03ca700c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[memtag] Disable memtag for AndroidMk host modules." into sc-dev am: e9e08e9e 

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

Change-Id: I8acd4de2efa8f7e32620c475d1c50dcdce779e6d
parents 6d5366b5 e9e08e9e

core/config_sanitizers.mk

+7 −0
Original line number Diff line number Diff line
@@ -167,6 +167,13 @@ ifneq ($(filter address,$(my_sanitize)),) 
  my_sanitize_diag := $(filter-out cfi,$(my_sanitize_diag))

endif



# Disable memtag for host targets. Host executables in AndroidMk files are

# deprecated, but some partners still have them floating around.

ifdef LOCAL_IS_HOST_MODULE

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

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

endif



# Disable sanitizers which need the UBSan runtime for host targets.

ifdef LOCAL_IS_HOST_MODULE

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