commit 55f3c4c25e4ec9cf80331aa512df8daf8d601fdf
author Evgenii Stepanov <eugenis@google.com> Mon Apr 27 22:46:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 27 22:46:41 2015 +0000
tree 30f697405ae8f921cf6dd172ece0eb1aa31d2564
parent 959f0eccb444876eb4d30ff4d4542c078e5eb307
parent f0b15e173be354301fa38354d016211192e36460

Merge "Fix AddressSanitizer link order and multilib setup."

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 6bc3632..1357b39 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -173,6 +173,7 @@
 LOCAL_DPI_VARIANTS:=
 LOCAL_DPI_FILE_STEM:=
 LOCAL_SANITIZE:=
+LOCAL_SANITIZE_RECOVER:=
 
 # arch specific variables
 LOCAL_SRC_FILES_$(TARGET_ARCH):=

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 6b0c6c8..e195692 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -90,9 +90,17 @@
 endif
 
 ifneq ($(filter undefined,$(my_sanitize)),)
+  my_cflags += -fno-sanitize-recover=all
+
   ifdef LOCAL_IS_HOST_MODULE
     my_ldlibs += -ldl
   else
     $(error ubsan is not yet supported on the target)
   endif
 endif
+
+
+ifeq ($(strip $(LOCAL_SANITIZE_RECOVER)),true)
+  recover_arg := $(subst $(space),$(comma),$(my_sanitize)),
+  my_cflags += -fsanitize-recover=$(recover_arg)
+endif