diff options
Diffstat (limited to 'native')
| -rw-r--r-- | native/jni/Android.mk | 5 | ||||
| -rw-r--r-- | native/jni/HostUnitTests.mk | 63 | ||||
| -rw-r--r-- | native/jni/src/defines.h | 4 |
3 files changed, 4 insertions, 68 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 53846485f..b9fc414f8 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -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 \ -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. LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function @@ -95,9 +95,6 @@ include $(BUILD_SHARED_LIBRARY) #################### Clean up the tmp vars include $(LOCAL_PATH)/CleanupNativeFileList.mk -#################### Unit test on host environment -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 deleted file mode 100644 index 94cd764b4..000000000 --- a/native/jni/HostUnitTests.mk +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2014 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Host build is never supported in unbundled (NDK/tapas) build -ifeq (,$(TARGET_BUILD_APPS)) - -# HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11. -LATINIME_HOST_OSNAME := $(shell uname -s) -ifneq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this - -LOCAL_PATH := $(call my-dir) - -###################################### -include $(CLEAR_VARS) - -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 -Wall -Werror -LOCAL_CXX_STL := libc++ -LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) -LOCAL_MODULE := liblatinime_host_static_for_unittests -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES)) -include $(BUILD_HOST_STATIC_LIBRARY) - -#################### Host native tests -include $(CLEAR_VARS) -LATIN_IME_TEST_SRC_DIR := tests -LOCAL_ADDRESS_SANITIZER := true -LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CFLAGS += -Wall -Werror -LOCAL_CXX_STL := libc++ -LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) -LOCAL_MODULE := liblatinime_host_unittests -LOCAL_MODULE_TAGS := tests -LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST_FILES)) -LOCAL_STATIC_LIBRARIES += liblatinime_host_static_for_unittests -include $(BUILD_HOST_NATIVE_TEST) - -include $(LOCAL_PATH)/CleanupNativeFileList.mk - -endif # Darwin - TODO: Remove this - -endif # TARGET_BUILD_APPS - -#################### Clean up the tmp vars -LATINIME_HOST_OSNAME := -LATIN_IME_SRC_DIR := -LATIN_IME_TEST_SRC_DIR := diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 10b930e4f..1531b6cbe 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -17,6 +17,8 @@ #ifndef LATINIME_DEFINES_H #define LATINIME_DEFINES_H +#include <cstdint> + #ifdef __GNUC__ #define AK_FORCE_INLINE __attribute__((always_inline)) __inline__ #else // __GNUC__ @@ -51,7 +53,7 @@ AK_FORCE_INLINE static int intArrayToCharArray(const int *const source, const in int si = 0; int di = 0; 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 dest[di++] = codePoint; } else if (codePoint < 0x7FF) { // Two bytes |