StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I14a18088eb2d848f7d0839706eeab417e5de2633
This commit is contained in:
Treehugger Robot
2020-07-31 00:35:55 +00:00
committed by Automerger Merge Worker
parent 83cd57881d 96abdc1b3a
commit 9e3142d32e
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@@ -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:=

3
core/config_sanitizers.mk
View File

@@ -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.