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

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

Merge "make: HWASan exclude path support" into main am: ed234171 

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



Change-Id: I2622b382186b2e4fe512870b9891d03e3ca92ac0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df395d2d ed234171

core/config_sanitizers.mk

+12 −0
Original line number Diff line number Diff line
@@ -65,6 +65,18 @@ ifneq ($(filter memtag_heap, $(my_global_sanitize)),) 
  endif

endif



# Disable global HWASan in excluded paths

ifneq ($(filter hwaddress, $(my_global_sanitize)),)

  combined_exclude_paths := $(HWASAN_EXCLUDE_PATHS) \

                            $(PRODUCT_HWASAN_EXCLUDE_PATHS)



  ifneq ($(strip $(foreach dir,$(subst $(comma),$(space),$(combined_exclude_paths)),\

         $(filter $(dir)%,$(LOCAL_PATH)))),)

    my_global_sanitize := $(filter-out hwaddress,$(my_global_sanitize))

    my_global_sanitize_diag := $(filter-out hwaddress,$(my_global_sanitize_diag))

  endif

endif



ifneq ($(my_global_sanitize),)

  my_sanitize := $(my_global_sanitize) $(my_sanitize)

endif

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -261,6 +261,9 @@ _product_list_vars += PRODUCT_CFI_EXCLUDE_PATHS 
# Whether any paths should have HWASan enabled for components

_product_list_vars += PRODUCT_HWASAN_INCLUDE_PATHS



# Whether any paths are excluded from sanitization when SANITIZE_TARGET=hwaddress

_product_list_vars += PRODUCT_HWASAN_EXCLUDE_PATHS



# Whether any paths should have Memtag_heap enabled for components

_product_list_vars += PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS

_product_list_vars += PRODUCT_MEMTAG_HEAP_ASYNC_DEFAULT_INCLUDE_PATHS

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ $(call add_json_list, CFIExcludePaths, $(CFI_EXCLUDE_PATHS) $( 
$(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, HWASanIncludePaths,                $(HWASAN_INCLUDE_PATHS) $(PRODUCT_HWASAN_INCLUDE_PATHS))

$(call add_json_list, HWASanExcludePaths,                $(HWASAN_EXCLUDE_PATHS) $(PRODUCT_HWASAN_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) $(if $(filter true,$(PRODUCT_MEMTAG_HEAP_SKIP_DEFAULT_PATHS)),,$(PRODUCT_MEMTAG_HEAP_ASYNC_DEFAULT_INCLUDE_PATHS)))