resolved conflicts for merge of 62789539 to mnc-dev-plus-aosp
Change-Id: Ib8c51e77ec5a1de16dacbf374d934ddf5c734bdf
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_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_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_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_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
