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

Commit 56558338 authored Jul 30, 2020 by Pirama Arumuga Nainar

[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

parent ad970e69

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.