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

Merge "Rely on the platform -std default." am: d2af70179e am: 7493c3bc60 

am: e39fa388bf

Change-Id: I730e0a50202cba9077775cb89ff9b9af1c7158fc
main
Elliott Hughes 2016-10-08 21:58:08 +00:00 committed by android-build-merger
parent 3152809d46 e39fa388bf
commit 7d3f1341be
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/dicttoolkit/Android.mk
View File

@ -36,7 +36,7 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali
# 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
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
include $(LOCAL_PATH)/NativeFileList.mk include $(LOCAL_PATH)/NativeFileList.mk
include $(LATIN_IME_CORE_PATH)/NativeFileList.mk include $(LATIN_IME_CORE_PATH)/NativeFileList.mk

6
native/dicttoolkit/UnitTests.mk
View File

@ -28,10 +28,9 @@ LATIN_DICT_TOOLKIT_TEST_SRC_DIR := tests
include $(LOCAL_PATH)/NativeFileList.mk include $(LOCAL_PATH)/NativeFileList.mk
include $(LATIN_IME_CORE_PATH)/NativeFileList.mk include $(LATIN_IME_CORE_PATH)/NativeFileList.mk
# TODO: Remove -std=c++11 once it is set by default on host build.
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_CXX_STL := libc++ LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \
@ -45,9 +44,8 @@ include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
# TODO: Remove -std=c++11 once it is set by default on host build.
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_CXX_STL := libc++ LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \

6
native/jni/HostUnitTests.mk
View File

@ -27,10 +27,9 @@ include $(CLEAR_VARS)
include $(LOCAL_PATH)/NativeFileList.mk include $(LOCAL_PATH)/NativeFileList.mk
#################### Host library for unit test #################### Host library for unit test
# TODO: Remove -std=c++11 once it is set by default on host build.
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true LOCAL_CLANG := true
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)
@ -43,8 +42,7 @@ include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LATIN_IME_TEST_SRC_DIR := tests LATIN_IME_TEST_SRC_DIR := tests
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
# TODO: Remove -std=c++11 once it is set by default on host build. LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true LOCAL_CLANG := true
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)

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 += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true LOCAL_CLANG := true
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
@ -34,7 +34,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 += -std=c++11 -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true LOCAL_CLANG := true
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

3
tools/dicttool/NativeLib.mk
View File

@ -34,9 +34,6 @@ ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
LOCAL_MULTILIB := 64 LOCAL_MULTILIB := 64
endif #HOST_JDK_IS_64BIT_VERSION endif #HOST_JDK_IS_64BIT_VERSION
# For C++11
LOCAL_CFLAGS += -std=c++11
LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni
LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src
LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(LATINIME_NATIVE_SRC_DIR) LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(LATINIME_NATIVE_SRC_DIR)