aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-06-16 14:25:13 -0700
committerDan Albert <danalbert@google.com>2015-06-16 14:25:13 -0700
commitd0f8ff8ba5cb9f617b156da9aa699681750284e8 (patch)
treecd4c31a386b355c3351fc6a9b6bc68d1c14c0e89
parent7e5a367b7f5523654e25df92b4a353dc6679ba4b (diff)
downloadgmock-d0f8ff8ba5cb9f617b156da9aa699681750284e8.tar.gz
Use new sanitizer option.
Change-Id: Ia59bb21128032a47389d19394e0697cf15d775e4
-rw-r--r--src/Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Android.mk b/src/Android.mk
index fc7b74e..00c119d 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -90,7 +90,7 @@ LOCAL_C_INCLUDES := $(libgmock_host_includes)
LOCAL_C_FLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_host
LOCAL_MULTILIB := both
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -106,7 +106,7 @@ LOCAL_C_INCLUDES := $(libgmock_host_includes)
LOCAL_C_FLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main_host
LOCAL_MULTILIB := both
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -121,7 +121,7 @@ LOCAL_SRC_FILES := gmock-all.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_STATIC_LIBRARY)
@@ -135,7 +135,7 @@ LOCAL_SRC_FILES := gmock_main.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libgmock_main
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_STATIC_LIBRARY)
endif