aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/HostUnitTests.mk
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-10-22 10:54:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-22 10:54:18 +0000
commit9c0b3419dad52a91695eec52090b6f53a35b42e8 (patch)
tree914f80e89b59d37b2e0dbd4ef5db993b924fb0a4 /native/jni/HostUnitTests.mk
parentc1831d0b9279385c22f643d1236d79a9ff962f7d (diff)
parentb9dc32ffd5049da536cf0e1a9868e9cc189eabe9 (diff)
downloadlatinime-9c0b3419dad52a91695eec52090b6f53a35b42e8.tar.gz
latinime-9c0b3419dad52a91695eec52090b6f53a35b42e8.tar.xz
latinime-9c0b3419dad52a91695eec52090b6f53a35b42e8.zip
Merge "Revert "Enable ASan (Address Sanitizer) for native host test""
Diffstat (limited to 'native/jni/HostUnitTests.mk')
-rw-r--r--native/jni/HostUnitTests.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk
index 9e59283b6..6967d9b87 100644
--- a/native/jni/HostUnitTests.mk
+++ b/native/jni/HostUnitTests.mk
@@ -26,10 +26,8 @@ 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_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
-LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_host_static_for_unittests
LOCAL_MODULE_TAGS := optional
@@ -40,10 +38,8 @@ include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS)
LATIN_IME_TEST_SRC_DIR := tests
# TODO: Remove -std=c++11 once it is set by default on host build.
-LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
-LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_host_unittests
LOCAL_MODULE_TAGS := tests