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

Commit 38d4a2a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[memtag] Disable memtag for AndroidMk host modules."

parents e9423b0b b71a875b
Loading
Loading
Loading
Loading
+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))