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

Commit 6552424f authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Gerrit Code Review
Browse files

Merge "[config_sanitizers] Fail if LOCAL_SANITIZE_BLACKLIST is used."

parents b5bbe4bc 1ac5384a

core/clear_vars.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -258,7 +258,6 @@ LOCAL_SANITIZE:= 
LOCAL_SANITIZE_DIAG:=

LOCAL_SANITIZE_DIAG:=

LOCAL_SANITIZE_RECOVER:=

LOCAL_SANITIZE_RECOVER:=

LOCAL_SANITIZE_NO_RECOVER:=

LOCAL_SANITIZE_NO_RECOVER:=

LOCAL_SANITIZE_BLACKLIST :=

LOCAL_SANITIZE_BLOCKLIST :=

LOCAL_SANITIZE_BLOCKLIST :=

LOCAL_SDK_LIBRARIES :=

LOCAL_SDK_LIBRARIES :=

LOCAL_SDK_RES_VERSION:=

LOCAL_SDK_RES_VERSION:=

core/config.mk

+1 −0
Original line number Original line 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_PATHS,Use NATIVE_COVERAGE_PATHS instead)

$(KATI_obsolete_var COVERAGE_EXCLUDE_PATHS,Use NATIVE_COVERAGE_EXCLUDE_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 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.

# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

.PHONY: FORCE

core/config_sanitizers.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -144,9 +144,6 @@ endif 




# Support for local sanitize blacklist paths.

# Support for local sanitize blacklist paths.

ifneq ($(my_sanitize)$(my_global_sanitize),)

ifneq ($(my_sanitize)$(my_global_sanitize),)

  ifneq ($(LOCAL_SANITIZE_BLACKLIST),)

    my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLACKLIST)

  endif

  ifneq ($(LOCAL_SANITIZE_BLOCKLIST),)

  ifneq ($(LOCAL_SANITIZE_BLOCKLIST),)

    my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLOCKLIST)

    my_cflags += -fsanitize-blacklist=$(LOCAL_PATH)/$(LOCAL_SANITIZE_BLOCKLIST)

  endif

  endif