openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

[config_sanitizers] Support LOCAL_SANITIZE_BLOCKLIST 

It'll replace LOCAL_SANITIZE_BLACKLIST.

Update language to comply with Android’s inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Bug: 162245450

Test: n/a  (no users in AOSP for this property).
Change-Id: Ie31c35af722d05011a528e1170b0c026b50fbf88
This commit is contained in:
Pirama Arumuga Nainar 2020-07-30 15:18:07 -07:00
parent ad970e69f3
commit 565583382d
2 changed files with 4 additions and 0 deletions
Show Stats 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_RECOVER:=
LOCAL_SANITIZE_NO_RECOVER:= LOCAL_SANITIZE_NO_RECOVER:=
LOCAL_SANITIZE_BLACKLIST := LOCAL_SANITIZE_BLACKLIST :=
LOCAL_SANITIZE_BLOCKLIST :=
LOCAL_SDK_LIBRARIES := LOCAL_SDK_LIBRARIES :=
LOCAL_SDK_RES_VERSION:= LOCAL_SDK_RES_VERSION:=
LOCAL_SDK_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),) ifneq ($(LOCAL_SANITIZE_BLACKLIST),)
my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLACKLIST) my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLACKLIST)
endif endif
ifneq ($(LOCAL_SANITIZE_BLOCKLIST),)
my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLOCKLIST)
endif
endif endif
# Disable integer_overflow if LOCAL_NOSANITIZE=integer. # Disable integer_overflow if LOCAL_NOSANITIZE=integer.