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

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

Merge "[config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST" am: 96abdc1b 

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

Change-Id: I14a18088eb2d848f7d0839706eeab417e5de2633
parents 83cd5788 96abdc1b

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ LOCAL_SANITIZE_DIAG:= 
LOCAL_SANITIZE_RECOVER:=

LOCAL_SANITIZE_NO_RECOVER:=

LOCAL_SANITIZE_BLACKLIST :=

LOCAL_SANITIZE_BLOCKLIST :=

LOCAL_SDK_LIBRARIES :=

LOCAL_SDK_RES_VERSION:=

LOCAL_SDK_VERSION:=

core/config_sanitizers.mk

+3 −0
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ ifneq ($(my_sanitize)$(my_global_sanitize),) 
  ifneq ($(LOCAL_SANITIZE_BLACKLIST),)

    my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLACKLIST)

  endif

  ifneq ($(LOCAL_SANITIZE_BLOCKLIST),)

    my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLOCKLIST)

  endif

endif



# Disable integer_overflow if LOCAL_NOSANITIZE=integer.