Merge "Rely on the platform -std default." am: 26989871a5
am: 35368f2475
Change-Id: I1dffb52b3f59a8fe42c4c42e10ff7c9287e81e63
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index b497cb1..909ca67 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
LOCAL_CLANG := true
-LOCAL_CPPFLAGS := -std=c++1y -Weverything -Werror
+LOCAL_CPPFLAGS := -Weverything -Werror
# The static constructors and destructors in this library have not been noted to
# introduce significant overheads
diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp
index 0777468..d5ff753 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -17,7 +17,6 @@
clang: true,
cppflags: [
- "-std=c++1y",
"-Weverything",
"-Werror",