diff options
| author |   Elliott Hughes <enh@google.com> | 2016-10-07 15:41:05 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-10-07 15:41:05 -0700 |
| commit | 8fd22fa4942496033c0a32db95aed724a1688634 (patch) | |
| tree | ae9d49a151168f4a7e8bdf4cba24e356cbb175ae /native/dicttoolkit/UnitTests.mk | |
| parent | 8181498163f088f2dbd5fa093e6f6beb3445a848 (diff) | |
| download | latinime-8fd22fa4942496033c0a32db95aed724a1688634.tar.gz latinime-8fd22fa4942496033c0a32db95aed724a1688634.tar.xz latinime-8fd22fa4942496033c0a32db95aed724a1688634.zip | |
Rely on the platform -std default.
Bug: http://b/32019064
Test: builds
Change-Id: I17611b6d9598992bd52cf3dc93509f0f5e0bdcde
Diffstat (limited to 'native/dicttoolkit/UnitTests.mk')
| -rw-r--r-- | native/dicttoolkit/UnitTests.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/native/dicttoolkit/UnitTests.mk b/native/dicttoolkit/UnitTests.mk index 96e28730e..da1b3767c 100644 --- a/native/dicttoolkit/UnitTests.mk +++ b/native/dicttoolkit/UnitTests.mk @@ -28,10 +28,9 @@ LATIN_DICT_TOOLKIT_TEST_SRC_DIR := tests include $(LOCAL_PATH)/NativeFileList.mk 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_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ @@ -45,9 +44,8 @@ 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_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ |