Merge "Rely on the platform -std default." am: 53b6fc5ddc am: 0ef01bab39 am: b48bc88b75
am: a16f14f826
Change-Id: Idadc8d71628f57e8c50abc6dd1a928dc42590fbc
diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp
index e354b11..4f77eed 100644
--- a/libs/binder/tests/Android.bp
+++ b/libs/binder/tests/Android.bp
@@ -46,7 +46,6 @@
"-g",
"-Wall",
"-Werror",
- "-std=c++11",
"-Wno-missing-field-initializers",
"-Wno-sign-compare",
"-O3",
diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp
index f0b5eda..029a420 100644
--- a/libs/input/tests/Android.bp
+++ b/libs/input/tests/Android.bp
@@ -23,7 +23,6 @@
name: "StructLayout_test",
srcs: ["StructLayout_test.cpp"],
cflags: [
- "-std=c++11",
"-O0",
],
}
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index f008099..5c180dc 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -117,7 +117,6 @@
endif
LOCAL_CFLAGS += -fvisibility=hidden -Werror=format
-LOCAL_CFLAGS += -std=c++14
LOCAL_STATIC_LIBRARIES := libtrace_proto libvkjson
LOCAL_SHARED_LIBRARIES := \
@@ -149,7 +148,6 @@
LOCAL_LDFLAGS_32 := -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic
LOCAL_LDFLAGS_64 := -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic
LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
-LOCAL_CPPFLAGS := -std=c++14
LOCAL_INIT_RC := surfaceflinger.rc
@@ -189,7 +187,6 @@
LOCAL_CLANG := true
LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
-LOCAL_CPPFLAGS := -std=c++14
LOCAL_SRC_FILES := \
DdmConnection.cpp