diff options
| author | Dan Albert <danalbert@google.com> | 2015-06-16 21:16:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-16 21:16:09 +0000 |
| commit | dabc7dd8312f9e80db7da26a2ab0eeb0833dd333 (patch) | |
| tree | 61c9eb7a57fae5ea450846dcf79c5a4b2567f7bc | |
| parent | ae65c436cada904c8ac1996a445ec5da66cc129e (diff) | |
| parent | aa242ae799b49750242db056c691539a7476841a (diff) | |
| download | gtest-dabc7dd8312f9e80db7da26a2ab0eeb0833dd333.tar.gz | |
Merge "Use new sanitizer option."gradle_1.3.1gradle_1.3.0-beta4android-m-preview-1studio-1.3-release
| -rw-r--r-- | src/Android.mk | 8 |
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 |