diff options
| author | Christopher Wiley <wiley@google.com> | 2015-07-24 16:38:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 16:38:57 +0000 |
| commit | c6c2885185ac02e58fdefac4e38fb5f8a6d194f3 (patch) | |
| tree | cd4c31a386b355c3351fc6a9b6bc68d1c14c0e89 | |
| parent | 62789539e00b74aec5c28d491da1a478ea431917 (diff) | |
| parent | 211806ade546b5e3ca3cc320796fe9983ec5ea1e (diff) | |
| download | gmock-c6c2885185ac02e58fdefac4e38fb5f8a6d194f3.tar.gz | |
am 211806ad: Merge "Use new sanitizer option."
* commit '211806ade546b5e3ca3cc320796fe9983ec5ea1e':
Use new sanitizer option.
| -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 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 |