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

Commit 041ed5a7 authored by Ivan Lozano's avatar Ivan Lozano Committed by android-build-merger
Browse files

Merge "Fix exclusion overriding local integer_overflow." am: b549e826 

am: a458ab05

Change-Id: Ib136b4fc2cabc7dd5bfd10442028b0e01d34dc22
parents f4859586 a458ab05

core/config_sanitizers.mk

+13 −10
Original line number Diff line number Diff line
@@ -22,6 +22,18 @@ ifeq ($(my_clang),true) 
  endif

endif



# Disable global integer_overflow in excluded paths.

ifneq ($(filter integer_overflow, $(my_global_sanitize)),)

  combined_exclude_paths := $(INTEGER_OVERFLOW_EXCLUDE_PATHS) \

                            $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS)



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

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

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

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

  endif

endif



ifneq ($(my_global_sanitize),)

  my_sanitize := $(my_global_sanitize) $(my_sanitize)

endif
@@ -103,17 +115,8 @@ ifneq ($(my_sanitize)$(my_global_sanitize),) 
  endif

endif



ifneq ($(filter integer_overflow, $(my_global_sanitize) $(my_sanitize)),)

  # Disable integer_overflow in excluded paths.

  combined_exclude_paths := $(INTEGER_OVERFLOW_EXCLUDE_PATHS) \

                            $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS)



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

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

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

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

  endif

# Disable integer_overflow if LOCAL_NOSANITIZE=integer.

ifneq ($(filter integer_overflow, $(my_global_sanitize) $(my_sanitize)),)

  ifneq ($(filter integer, $(strip $(LOCAL_NOSANITIZE))),)

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

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