nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: f3681fed6d 

am: 707fd5c3d2

Change-Id: Ie6eb2d7f07c5cc734fe442315ecf57d68512180d
main
Chih-hung Hsieh 2017-10-30 19:45:38 +00:00 committed by android-build-merger
parent ffa65d4823 707fd5c3d2
commit 4424dbc80b
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/Android.mk
View File

@ -88,6 +88,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := c++_static LOCAL_NDK_STL_VARIANT := c++_static
LOCAL_CFLAGS := -Wall -Werror
LOCAL_LDFLAGS += -ldl LOCAL_LDFLAGS += -ldl
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
@ -99,3 +100,4 @@ include $(LOCAL_PATH)/HostUnitTests.mk
#################### Unit test on target environment #################### Unit test on target environment
include $(LOCAL_PATH)/TargetUnitTests.mk include $(LOCAL_PATH)/TargetUnitTests.mk
//LOCAL_CFLAGS += -Wall -Werror

2
native/jni/HostUnitTests.mk
View File

@ -29,7 +29,7 @@ include $(LOCAL_PATH)/NativeFileList.mk
#################### Host library for unit test #################### Host library for unit test
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
LOCAL_ADDRESS_SANITIZER := true 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_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_host_static_for_unittests LOCAL_MODULE := liblatinime_host_static_for_unittests

4
native/jni/TargetUnitTests.mk
View File

@ -21,7 +21,7 @@ include $(LOCAL_PATH)/NativeFileList.mk
#################### Target library for unit test #################### Target library for unit test
LATIN_IME_SRC_DIR := src 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_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_target_static_for_unittests LOCAL_MODULE := liblatinime_target_static_for_unittests
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
@ -33,7 +33,7 @@ include $(BUILD_STATIC_LIBRARY)
#################### Target native tests #################### Target native tests
include $(CLEAR_VARS) include $(CLEAR_VARS)
LATIN_IME_TEST_SRC_DIR := tests 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_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_target_unittests LOCAL_MODULE := liblatinime_target_unittests
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests

1
native/jni/tests/dictionary/utils/trie_map_test.cpp
View File

@ -55,6 +55,7 @@ TEST(TrieMapTest, TestRemove) {
EXPECT_TRUE(trieMap.remove(10, trieMap.getRootBitmapEntryIndex())); EXPECT_TRUE(trieMap.remove(10, trieMap.getRootBitmapEntryIndex()));
EXPECT_FALSE(trieMap.getRoot(10).mIsValid); EXPECT_FALSE(trieMap.getRoot(10).mIsValid);
for (const auto &element : trieMap.getEntriesInRootLevel()) { for (const auto &element : trieMap.getEntriesInRootLevel()) {
(void)element; // not used
EXPECT_TRUE(false); EXPECT_TRUE(false);
} }
EXPECT_TRUE(trieMap.putRoot(10, 0x3FFFFF)); EXPECT_TRUE(trieMap.putRoot(10, 0x3FFFFF));