diff options
| author |   Chih-hung Hsieh <chh@google.com> | 2017-10-30 19:56:45 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2017-10-30 19:56:45 +0000 |
| commit | e04f43ca92f96cd46a5506665cc784d14fd8ff2e (patch) | |
| tree | a8dd8b09d2e3b1dfef2c9ce9dbe057cb6614f308 | |
| parent | 01e4844599c9423c99dd95d43dbd085e786dd791 (diff) | |
| parent | 4424dbc80bcc7f0dec557fff8d7be262b15839c5 (diff) | |
| download | latinime-e04f43ca92f96cd46a5506665cc784d14fd8ff2e.tar.gz latinime-e04f43ca92f96cd46a5506665cc784d14fd8ff2e.tar.xz latinime-e04f43ca92f96cd46a5506665cc784d14fd8ff2e.zip | |
Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: f3681fed6d am: 707fd5c3d2
am: 4424dbc80b
Change-Id: If238e8ffc1e7c4f0d7b436fcc568fca4bb098d78
| -rw-r--r-- | native/jni/Android.mk | 2 | ||||
| -rw-r--r-- | native/jni/HostUnitTests.mk | 2 | ||||
| -rw-r--r-- | native/jni/TargetUnitTests.mk | 4 | ||||
| -rw-r--r-- | native/jni/tests/dictionary/utils/trie_map_test.cpp | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 01b32a95e..53846485f 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -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 diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk index 6dd615cf7..baf1cace3 100644 --- a/native/jni/HostUnitTests.mk +++ b/native/jni/HostUnitTests.mk @@ -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 diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk index b05cd1401..32aada057 100644 --- a/native/jni/TargetUnitTests.mk +++ b/native/jni/TargetUnitTests.mk @@ -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 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)); |