6 files changed, 7 insertions, 12 deletions
diff --git a/native/dicttoolkit/Android.mk b/native/dicttoolkit/Android.mk
index 4befecf4a..7a446860c 100644
--- a/native/dicttoolkit/Android.mk
+++ b/native/dicttoolkit/Android.mk
@@ -51,7 +51,6 @@ LOCAL_SRC_FILES := $(LATIN_IME_DICT_TOOLKIT_MAIN_SRC_FILES) \
 LOCAL_MODULE := dicttoolkit
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_CLANG := true
 LOCAL_CXX_STL := libc++
 
 include $(BUILD_HOST_EXECUTABLE)
diff --git a/native/dicttoolkit/UnitTests.mk b/native/dicttoolkit/UnitTests.mk
index da1b3767c..55177c084 100644
--- a/native/dicttoolkit/UnitTests.mk
+++ b/native/dicttoolkit/UnitTests.mk
@@ -31,7 +31,6 @@ include $(LATIN_IME_CORE_PATH)/NativeFileList.mk
 LATIN_IME_SRC_DIR := src
 LOCAL_ADDRESS_SANITIZER := true
 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) \
     $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR)
@@ -46,7 +45,6 @@ include $(CLEAR_VARS)
 
 LOCAL_ADDRESS_SANITIZER := true
 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) \
     $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR)
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 6003a6f64..53846485f 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -63,7 +63,6 @@ endif # FLAG_DO_PROFILE
 LOCAL_MODULE := libjni_latinime_common_static
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_CLANG := true
 LOCAL_SDK_VERSION := 14
 LOCAL_NDK_STL_VARIANT := c++_static
 
@@ -87,9 +86,9 @@ endif # FLAG_DO_PROFILE
 LOCAL_MODULE := libjni_latinime
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_CLANG := true
 LOCAL_SDK_VERSION := 14
 LOCAL_NDK_STL_VARIANT := c++_static
+LOCAL_CFLAGS := -Wall -Werror
 LOCAL_LDFLAGS += -ldl
 
 include $(BUILD_SHARED_LIBRARY)
@@ -101,3 +100,4 @@ include $(LOCAL_PATH)/HostUnitTests.mk
 
 #################### Unit test on target environment
 include $(LOCAL_PATH)/TargetUnitTests.mk
+//LOCAL_CFLAGS += -Wall -Werror
diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk
index 6a8bcec2d..94cd764b4 100644
--- a/native/jni/HostUnitTests.mk
+++ b/native/jni/HostUnitTests.mk
@@ -29,8 +29,7 @@ include $(LOCAL_PATH)/NativeFileList.mk
 #################### Host library for unit test
 LATIN_IME_SRC_DIR := src
 LOCAL_ADDRESS_SANITIZER := true
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
-LOCAL_CLANG := true
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -Wall -Werror
 LOCAL_CXX_STL := libc++
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
 LOCAL_MODULE := liblatinime_host_static_for_unittests
@@ -43,7 +42,7 @@ include $(CLEAR_VARS)
 LATIN_IME_TEST_SRC_DIR := tests
 LOCAL_ADDRESS_SANITIZER := true
 LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
-LOCAL_CLANG := true
+LOCAL_CFLAGS += -Wall -Werror
 LOCAL_CXX_STL := libc++
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
 LOCAL_MODULE := liblatinime_host_unittests
diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk
index 69a32edbd..32aada057 100644
--- a/native/jni/TargetUnitTests.mk
+++ b/native/jni/TargetUnitTests.mk
@@ -21,8 +21,7 @@ include $(LOCAL_PATH)/NativeFileList.mk
 
 #################### Target library for unit test
 LATIN_IME_SRC_DIR := src
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
-LOCAL_CLANG := true
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -Wall -Werror
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
 LOCAL_MODULE := liblatinime_target_static_for_unittests
 LOCAL_MODULE_TAGS := optional
@@ -34,8 +33,7 @@ include $(BUILD_STATIC_LIBRARY)
 #################### Target native tests
 include $(CLEAR_VARS)
 LATIN_IME_TEST_SRC_DIR := tests
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
-LOCAL_CLANG := true
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -Wall -Werror
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
 LOCAL_MODULE := liblatinime_target_unittests
 LOCAL_MODULE_TAGS := tests
diff --git a/native/jni/tests/dictionary/utils/trie_map_test.cpp b/native/jni/tests/dictionary/utils/trie_map_test.cpp
index 745d39897..8f3ec9d24 100644
--- a/native/jni/tests/dictionary/utils/trie_map_test.cpp
+++ b/native/jni/tests/dictionary/utils/trie_map_test.cpp
@@ -55,6 +55,7 @@ TEST(TrieMapTest, TestRemove) {
     EXPECT_TRUE(trieMap.remove(10, trieMap.getRootBitmapEntryIndex()));
     EXPECT_FALSE(trieMap.getRoot(10).mIsValid);
     for (const auto &element : trieMap.getEntriesInRootLevel()) {
+        (void)element; // not used
         EXPECT_TRUE(false);
     }
     EXPECT_TRUE(trieMap.putRoot(10, 0x3FFFFF));