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

Commit 35de4fa5 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Automerger Merge Worker
Browse files

Merge "[config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used." am: 6552424f 

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

Change-Id: I79d9905f1cd3ff60622dafadbeb83dae792e291d
parents 17d9d8ba 6552424f

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -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:=

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

core/config_sanitizers.mk

+0 −3
Original line number Diff line number Diff line
@@ -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