4 files changed, 10 insertions, 14 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) \
diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk
index e30d50a2e..6a8bcec2d 100644
--- a/native/jni/HostUnitTests.mk
+++ b/native/jni/HostUnitTests.mk
@@ -27,10 +27,9 @@ include $(CLEAR_VARS)
 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_CFLAGS += -Wno-unused-parameter -Wno-unused-function
 LOCAL_CLANG := true
 LOCAL_CXX_STL := libc++
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
@@ -43,8 +42,7 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LATIN_IME_TEST_SRC_DIR := tests
 LOCAL_ADDRESS_SANITIZER := true
-# 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_CFLAGS += -Wno-unused-parameter -Wno-unused-function
 LOCAL_CLANG := true
 LOCAL_CXX_STL := libc++
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk
index ae838233f..69a32edbd 100644
--- a/native/jni/TargetUnitTests.mk
+++ b/native/jni/TargetUnitTests.mk
@@ -21,22 +21,20 @@ include $(LOCAL_PATH)/NativeFileList.mk
 
 #################### Target library for unit test
 LATIN_IME_SRC_DIR := src
-LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
 LOCAL_CLANG := true
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
 LOCAL_MODULE := liblatinime_target_static_for_unittests
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES))
-# Here intentionally use libc++_shared rather than libc++_static because
-# $(BUILD_NATIVE_TEST) has not yet supported libc++_static.
 LOCAL_SDK_VERSION := 14
-LOCAL_NDK_STL_VARIANT := c++_shared
+LOCAL_NDK_STL_VARIANT := c++_static
 include $(BUILD_STATIC_LIBRARY)
 
 #################### Target native tests
 include $(CLEAR_VARS)
 LATIN_IME_TEST_SRC_DIR := tests
-LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
 LOCAL_CLANG := true
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
 LOCAL_MODULE := liblatinime_target_unittests
@@ -44,6 +42,8 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES :=  \
     $(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST_FILES))
 LOCAL_STATIC_LIBRARIES += liblatinime_target_static_for_unittests
+LOCAL_SDK_VERSION := 14
+LOCAL_NDK_STL_VARIANT := c++_static
 include $(BUILD_NATIVE_TEST)
 
 #################### Clean up the tmp vars