diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 7f420a70d8..307c2c2274 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -258,7 +258,6 @@ LOCAL_SANITIZE:= LOCAL_SANITIZE_DIAG:= LOCAL_SANITIZE_RECOVER:= LOCAL_SANITIZE_NO_RECOVER:= -LOCAL_SANITIZE_BLACKLIST := LOCAL_SANITIZE_BLOCKLIST := LOCAL_SDK_LIBRARIES := LOCAL_SDK_RES_VERSION:= diff --git a/core/config.mk b/core/config.mk index 1a0a418681..2b9a6120e8 100644 --- a/core/config.mk +++ b/core/config.mk @@ -154,6 +154,7 @@ $(KATI_obsolete_var PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST,Use PRODUCT_ARTI $(KATI_obsolete_var COVERAGE_PATHS,Use NATIVE_COVERAGE_PATHS instead) $(KATI_obsolete_var COVERAGE_EXCLUDE_PATHS,Use NATIVE_COVERAGE_EXCLUDE_PATHS instead) $(KATI_obsolete_var BOARD_VNDK_RUNTIME_DISABLE,VNDK-Lite is no longer supported.) +$(KATI_obsolete_var LOCAL_SANITIZE_BLACKLIST,Use LOCAL_SANITIZE_BLOCKLIST instead.) # Used to force goals to build. Only use for conditionally defined goals. .PHONY: FORCE diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 323bb36d9d..eaab1b5eca 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -144,9 +144,6 @@ endif # Support for local sanitize blacklist paths. 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