From 8fd22fa4942496033c0a32db95aed724a1688634 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 7 Oct 2016 15:41:05 -0700 Subject: [PATCH] Rely on the platform -std default. Bug: http://b/32019064 Test: builds Change-Id: I17611b6d9598992bd52cf3dc93509f0f5e0bdcde --- native/dicttoolkit/Android.mk | 2 +- native/dicttoolkit/UnitTests.mk | 6 ++---- native/jni/HostUnitTests.mk | 6 ++---- native/jni/TargetUnitTests.mk | 4 ++-- 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)