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

Commit 00997c2a authored by Ivan Lozano's avatar Ivan Lozano Committed by Gerrit Code Review
Browse files

Merge "Add make var to avoid recovering with diagnostics."

parents 3b1d5a15 5fb2de70

core/clear_vars.mk

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

LOCAL_SANITIZE_DIAG:=

LOCAL_SANITIZE_RECOVER:=

LOCAL_SANITIZE_NO_RECOVER:=

LOCAL_SANITIZE_BLACKLIST :=

LOCAL_SDK_LIBRARIES :=

LOCAL_SDK_RES_VERSION:=

core/config_sanitizers.mk

+5 −0
Original line number Diff line number Diff line
@@ -401,6 +401,11 @@ ifneq ($(strip $(LOCAL_SANITIZE_RECOVER)),) 
  my_cflags += -fsanitize-recover=$(recover_arg)

endif



ifneq ($(strip $(LOCAL_SANITIZE_NO_RECOVER)),)

  no_recover_arg := $(subst $(space),$(comma),$(LOCAL_SANITIZE_NO_RECOVER)),

  my_cflags += -fno-sanitize-recover=$(no_recover_arg)

endif



ifneq ($(my_sanitize_diag),)

  # TODO(vishwath): Add diagnostic support for static executables once

  # we switch to clang-4393122 (which adds the static ubsan runtime