diff options
| author |   Elliott Hughes <enh@google.com> | 2016-10-08 21:58:08 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2016-10-08 21:58:08 +0000 |
| commit | 7d3f1341bea99fc4139ebf362c161ebdcb255e95 (patch) | |
| tree | 07c368c9f71bd65c328b0c9f9bcbce133030a6fb | |
| parent | 3152809d46b4237ea52f8a4164304810578375e7 (diff) | |
| parent | e39fa388bfb46822ed59ed7c2c3ac93bd331beb9 (diff) | |
| download | latinime-7d3f1341bea99fc4139ebf362c161ebdcb255e95.tar.gz latinime-7d3f1341bea99fc4139ebf362c161ebdcb255e95.tar.xz latinime-7d3f1341bea99fc4139ebf362c161ebdcb255e95.zip | |
Merge "Rely on the platform -std default." am: d2af70179e am: 7493c3bc60
am: e39fa388bf
Change-Id: I730e0a50202cba9077775cb89ff9b9af1c7158fc
| -rw-r--r-- | native/dicttoolkit/Android.mk | 2 | ||||
| -rw-r--r-- | native/dicttoolkit/UnitTests.mk | 6 | ||||
| -rw-r--r-- | native/jni/HostUnitTests.mk | 6 | ||||
| -rw-r--r-- | native/jni/TargetUnitTests.mk | 4 | ||||
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 3 |
5 files changed, 7 insertions, 14 deletions
diff --git a/native/dicttoolkit/Android.mk b/native/dicttoolkit/Android.mk index 118682dfc..4befecf4a 100644 --- a/native/dicttoolkit/Android.mk +++ b/native/dicttoolkit/Android.mk @@ -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. 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 $(LATIN_IME_CORE_PATH)/NativeFileList.mk diff --git a/native/dicttoolkit/UnitTests.mk b/native/dicttoolkit/UnitTests.mk index 96e28730e..da1b3767c 100644 --- a/native/dicttoolkit/UnitTests.mk +++ b/native/dicttoolkit/UnitTests.mk @@ -28,10 +28,9 @@ LATIN_DICT_TOOLKIT_TEST_SRC_DIR := tests include $(LOCAL_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 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_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ @@ -45,9 +44,8 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -# TODO: Remove -std=c++11 once it is set by default on host build. 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_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk index e30d50a2e..6a8bcec2d 100644 --- a/native/jni/HostUnitTests.mk +++ b/native/jni/HostUnitTests.mk @@ -27,10 +27,9 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/NativeFileList.mk #################### Host library for unit test -# TODO: Remove -std=c++11 once it is set by default on host build. LATIN_IME_SRC_DIR := src 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_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) @@ -43,8 +42,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LATIN_IME_TEST_SRC_DIR := tests LOCAL_ADDRESS_SANITIZER := true -# TODO: Remove -std=c++11 once it is set by default on host build. -LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk index eefd4fcf3..69a32edbd 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 += -std=c++11 -Wno-unused-parameter -Wno-unused-function +LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CLANG := true LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_target_static_for_unittests @@ -34,7 +34,7 @@ include $(BUILD_STATIC_LIBRARY) #################### Target native tests include $(CLEAR_VARS) 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_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_target_unittests diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk index ffb32edbe..622a9f171 100644 --- a/tools/dicttool/NativeLib.mk +++ b/tools/dicttool/NativeLib.mk @@ -34,9 +34,6 @@ ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),) LOCAL_MULTILIB := 64 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_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(LATINIME_NATIVE_SRC_DIR) |