commit 10b4d0ad5db201419c4a9acfec7a39ef1821e9e5
author Evgenii Stepanov <eugenis@google.com> Tue Jan 05 16:36:56 2021 -0800
committer Evgenii Stepanov <eugenis@google.com> Mon Jan 11 21:15:21 2021 -0800
tree 9c7bb12e0382eded835ed548a5752b26518ab93f
parent 8f8522a83bb89669e2c70221b85ffb573e8b9ffc

Include/exclude paths for memtag sanitizer.

Bug: b/135772972
Test: none
Change-Id: Ib198c359b92b82573cb66fd6d993aece0e9ff7d9

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 48ab0eb..5ca1d10 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -103,6 +103,10 @@
 $(call add_json_list, CFIIncludePaths,                   $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS))
 $(call add_json_list, IntegerOverflowExcludePaths,       $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))
 
+$(call add_json_list, MemtagHeapExcludePaths,            $(MEMTAG_HEAP_EXCLUDE_PATHS) $(PRODUCT_MEMTAG_HEAP_EXCLUDE_PATHS))
+$(call add_json_list, MemtagHeapAsyncIncludePaths,       $(MEMTAG_HEAP_ASYNC_INCLUDE_PATHS) $(PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS))
+$(call add_json_list, MemtagHeapSyncIncludePaths,        $(MEMTAG_HEAP_SYNC_INCLUDE_PATHS) $(PRODUCT_MEMTAG_HEAP_SYNC_INCLUDE_PATHS))
+
 $(call add_json_bool, DisableScudo,                      $(filter true,$(PRODUCT_DISABLE_SCUDO)))
 
 $(call add_json_bool, ClangTidy,                         $(filter 1 true,$(WITH_TIDY)))