commit 00997c2ac25b17e63131f324fad19ebebbb96c79
author Ivan Lozano <ivanlozano@google.com> Thu Dec 13 20:56:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 13 20:56:18 2018 +0000
tree 8c4c62bc5110ac3319edac3b3ad0502cec3a966e
parent 3b1d5a153885f49336394e90e8a03a6ac79da8b1
parent 5fb2de70868698c6e319e330046436113ff634ee

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

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index a0f523b..0fce502 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -248,6 +248,7 @@
 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

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 7b4015e..51b859e 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -401,6 +401,11 @@
   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