aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-06-16 14:07:16 -0700
committerDan Albert <danalbert@google.com>2015-06-16 14:07:16 -0700
commitaa242ae799b49750242db056c691539a7476841a (patch)
tree61c9eb7a57fae5ea450846dcf79c5a4b2567f7bc
parentae65c436cada904c8ac1996a445ec5da66cc129e (diff)
downloadgtest-aa242ae799b49750242db056c691539a7476841a.tar.gz
Use new sanitizer option.
Change-Id: I0e535d0d22ca7868ae1d66e7fdbf41c6bc5e358f
-rw-r--r--src/Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Android.mk b/src/Android.mk
index ec0a3c2..3d377f0 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -86,7 +86,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
LOCAL_MODULE := libgtest_host
LOCAL_MULTILIB := both
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -101,7 +101,7 @@ LOCAL_C_INCLUDES := $(libgtest_host_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
LOCAL_MODULE := libgtest_main_host
LOCAL_MULTILIB := both
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -118,7 +118,7 @@ LOCAL_SRC_FILES := gtest-all.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
LOCAL_MODULE := libgtest
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_STATIC_LIBRARY)
@@ -133,7 +133,7 @@ LOCAL_SRC_FILES := gtest_main.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
LOCAL_MODULE := libgtest_main
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_STATIC_LIBRARY)
endif