am 9c0b3419: Merge "Revert "Enable ASan (Address Sanitizer) for native host test""

* commit '9c0b3419dad52a91695eec52090b6f53a35b42e8':
  Revert "Enable ASan (Address Sanitizer) for native host test"
main
Yohei Yukawa 2014-10-22 10:57:16 +00:00 committed by Android Git Automerger
commit 48ca94a394
1 changed files with 0 additions and 4 deletions

View File

@ -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