From 1c2d67434600ac3a205fbe2a00b0b921f308a42d Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 23 Jun 2015 16:26:07 -0700 Subject: [PATCH] Use the new sanitizer option. I apparently forgot to upload this change last week when I was cleaning this up. Change-Id: Ibe8c871b4ebb2e814b8d234f8f38fa5f5f721ae2 --- native/dicttoolkit/UnitTests.mk | 4 ++-- native/jni/HostUnitTests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/native/dicttoolkit/UnitTests.mk b/native/dicttoolkit/UnitTests.mk index 96e28730e..75d57f0ed 100644 --- a/native/dicttoolkit/UnitTests.mk +++ b/native/dicttoolkit/UnitTests.mk @@ -30,7 +30,7 @@ include $(LATIN_IME_CORE_PATH)/NativeFileList.mk # TODO: Remove -std=c++11 once it is set by default on host build. LATIN_IME_SRC_DIR := src -LOCAL_ADDRESS_SANITIZER := true +LOCAL_SANITIZE := address LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ @@ -46,7 +46,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) # TODO: Remove -std=c++11 once it is set by default on host build. -LOCAL_ADDRESS_SANITIZER := true +LOCAL_SANITIZE := address LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk index e30d50a2e..605cb6c9f 100644 --- a/native/jni/HostUnitTests.mk +++ b/native/jni/HostUnitTests.mk @@ -29,7 +29,7 @@ include $(LOCAL_PATH)/NativeFileList.mk #################### Host library for unit test # TODO: Remove -std=c++11 once it is set by default on host build. LATIN_IME_SRC_DIR := src -LOCAL_ADDRESS_SANITIZER := true +LOCAL_SANITIZE := address LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ @@ -42,7 +42,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) #################### Host native tests include $(CLEAR_VARS) LATIN_IME_TEST_SRC_DIR := tests -LOCAL_ADDRESS_SANITIZER := true +LOCAL_SANITIZE := address # TODO: Remove -std=c++11 once it is set by default on host build. LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true