Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
commit
f3681fed6d
|
@ -88,6 +88,7 @@ LOCAL_MODULE_TAGS := optional
|
|||
|
||||
LOCAL_SDK_VERSION := 14
|
||||
LOCAL_NDK_STL_VARIANT := c++_static
|
||||
LOCAL_CFLAGS := -Wall -Werror
|
||||
LOCAL_LDFLAGS += -ldl
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
@ -99,3 +100,4 @@ include $(LOCAL_PATH)/HostUnitTests.mk
|
|||
|
||||
#################### Unit test on target environment
|
||||
include $(LOCAL_PATH)/TargetUnitTests.mk
|
||||
//LOCAL_CFLAGS += -Wall -Werror
|
||||
|
|
|
@ -29,7 +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_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
|
||||
|
|
|
@ -21,7 +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_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
|
||||
|
@ -33,7 +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_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
|
||||
|
|
|
@ -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));
|
||||
|
|
Loading…
Reference in New Issue