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

Fix lint warnings in LatinIME JNI code 

This CL addresses compiler warnings when building libjni_latinime.so
with NDK from Android Studio.

There should be no behavior change.

Bug: 110741422
Bug: 110757803
Test: tapas LatinIME LatinIMETests arm64 userdebug && make -j
Change-Id: Icc711dd46511a167b1fd90028552def5b2f9941f
main
Yohei Yukawa 2018-07-25 17:11:00 -07:00
parent 41f89ae88c
commit 3d74fc73a8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/Android.mk
View File

@ -29,7 +29,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \
-Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls \ -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls \
-Woverloaded-virtual -Wsign-promo -Wno-system-headers -Woverloaded-virtual -Wsign-promo -Wno-system-headers -Wno-format-nonliteral
# To suppress compiler warnings for unused variables/functions used for debug features etc. # To suppress compiler warnings for unused variables/functions used for debug features etc.
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function

4
native/jni/src/defines.h
View File

@ -17,6 +17,8 @@
#ifndef LATINIME_DEFINES_H #ifndef LATINIME_DEFINES_H
#define LATINIME_DEFINES_H #define LATINIME_DEFINES_H
#include <cstdint>
#ifdef __GNUC__ #ifdef __GNUC__
#define AK_FORCE_INLINE __attribute__((always_inline)) __inline__ #define AK_FORCE_INLINE __attribute__((always_inline)) __inline__
#else // __GNUC__ #else // __GNUC__
@ -51,7 +53,7 @@ AK_FORCE_INLINE static int intArrayToCharArray(const int *const source, const in
int si = 0; int si = 0;
int di = 0; int di = 0;
while (si < sourceSize && di < destLimit && 0 != source[si]) { while (si < sourceSize && di < destLimit && 0 != source[si]) {
const int codePoint = source[si++]; const uint32_t codePoint = static_cast<uint32_t>(source[si++]);
if (codePoint < 0x7F) { // One byte if (codePoint < 0x7F) { // One byte
dest[di++] = codePoint; dest[di++] = codePoint;
} else if (codePoint < 0x7FF) { // Two bytes } else if (codePoint < 0x7FF) { // Two bytes