diff options
Diffstat (limited to 'native/dicttoolkit')
| -rw-r--r-- | native/dicttoolkit/Android.mk | 2 | ||||
| -rw-r--r-- | native/dicttoolkit/UnitTests.mk | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/native/dicttoolkit/Android.mk b/native/dicttoolkit/Android.mk index 118682dfc..4befecf4a 100644 --- a/native/dicttoolkit/Android.mk +++ b/native/dicttoolkit/Android.mk @@ -36,7 +36,7 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali # To suppress compiler warnings for unused variables/functions used for debug features etc. LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function include $(LOCAL_PATH)/NativeFileList.mk include $(LATIN_IME_CORE_PATH)/NativeFileList.mk 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) \ |