Move up to C++14.
The default standard version is now ahead of us. Stop specifying C++11
so we get that too.
Change-Id: Ic96942cd7fd134118e29b744601b0119e49b6ac4
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index e1580fe..20742bd 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -29,7 +29,6 @@
-Wunused \
benchmark_cppflags := \
- -std=gnu++11 \
benchmarklib_src_files := \
Benchmark.cpp \
diff --git a/libc/Android.mk b/libc/Android.mk
index 0f18ca4..74ac33b 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -623,7 +623,6 @@
# Define some common cppflags
libc_common_cppflags := \
- -std=gnu++11
# Define some common includes
# ========================================================
diff --git a/linker/Android.mk b/linker/Android.mk
index d378e90..8422018 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -42,7 +42,6 @@
-std=gnu99 \
LOCAL_CPPFLAGS += \
- -std=gnu++11 \
-Wold-style-cast \
ifeq ($(TARGET_IS_64_BIT),true)
diff --git a/linker/tests/Android.mk b/linker/tests/Android.mk
index 35992c5..0aaee3e 100644
--- a/linker/tests/Android.mk
+++ b/linker/tests/Android.mk
@@ -23,7 +23,7 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_CFLAGS += -g -Wall -Wextra -Wunused -Werror -std=gnu++11
+LOCAL_CFLAGS += -g -Wall -Wextra -Wunused -Werror
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../libc/
LOCAL_SRC_FILES := \
diff --git a/tests/Android.mk b/tests/Android.mk
index fc47e80..205ccc5 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -46,8 +46,7 @@
test_cflags += -DUSE_JEMALLOC
endif
-test_cppflags = \
- -std=gnu++11 \
+test_cppflags := \
libBionicStandardTests_src_files := \
arpa_inet_test.cpp \
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 662aeef..8615934 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH := $(call my-dir)
TEST_PATH := $(LOCAL_PATH)/..
-common_cppflags += -std=gnu++11
+common_cppflags :=
common_additional_dependencies := \
$(LOCAL_PATH)/Android.mk \
$(LOCAL_PATH)/Android.build.dt_runpath.mk \