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

Commit ff3341b3 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by Gerrit Code Review
Browse files

Merge "Add LOCAL_NOSANITIZE."

parents 55d4a46f 42823661

core/clear_vars.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ LOCAL_DPI_VARIANTS:= 
LOCAL_DPI_FILE_STEM:=

LOCAL_DPI_FILE_STEM:=

LOCAL_SANITIZE:=

LOCAL_SANITIZE:=

LOCAL_SANITIZE_RECOVER:=

LOCAL_SANITIZE_RECOVER:=

LOCAL_NOSANITIZE:=

LOCAL_DBUS_PROXY_PREFIX:=

LOCAL_DBUS_PROXY_PREFIX:=

LOCAL_INIT_RC:=

LOCAL_INIT_RC:=

LOCAL_MODULE_HOST_OS:=

LOCAL_MODULE_HOST_OS:=

core/config_sanitizers.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,11 @@ ifeq ($(LOCAL_SANITIZE),never) 
  my_sanitize :=

  my_sanitize :=

endif

endif





my_nosanitize = $(strip $(LOCAL_NOSANITIZE))

ifneq ($(my_nosanitize),)

  my_sanitize := $(filter-out $(my_nosanitize),$(my_sanitize))

endif



# TSAN is not supported on 32-bit architectures. For non-multilib cases, make

# TSAN is not supported on 32-bit architectures. For non-multilib cases, make

# its use an error. For multilib cases, don't use it for the 32-bit case.

# its use an error. For multilib cases, don't use it for the 32-bit case.

ifneq ($(filter thread,$(my_sanitize)),)

ifneq ($(filter thread,$(my_sanitize)),)