Merge "Add LOCAL_SANITIZE_RECOVER."

This commit is contained in:
Dan Albert 2015-04-27 19:53:01 +00:00 committed by Gerrit Code Review
commit 959f0eccb4
2 changed files with 9 additions and 0 deletions

View file

@ -173,6 +173,7 @@ LOCAL_NATIVE_COVERAGE :=
LOCAL_DPI_VARIANTS:=
LOCAL_DPI_FILE_STEM:=
LOCAL_SANITIZE:=
LOCAL_SANITIZE_RECOVER:=
# arch specific variables
LOCAL_SRC_FILES_$(TARGET_ARCH):=

View file

@ -86,9 +86,17 @@ ifneq ($(filter address,$(my_sanitize)),)
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