summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-10-12 00:32:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-10-12 00:32:21 +0000
commit26989871a55bd03310603dba23c0d6cad18de321 (patch)
tree41d108e14eeec86a1193f66d2980c1201756a386
parent53b6fc5ddcf90c171f08b21c656b829d8ec9aa18 (diff)
parent56a8d3260d1273a50a538f94bb376573c08e0600 (diff)
Merge "Rely on the platform -std default."
-rw-r--r--libs/gui/Android.mk2
-rw-r--r--libs/ui/Android.bp1
2 files changed, 1 insertions, 2 deletions
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index b497cb1a2a..909ca67cb2 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
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 0777468585..d5ff75325b 100644
--- a/libs/ui/Android.bp
+++ b/libs/ui/Android.bp
@@ -17,7 +17,6 @@ cc_library_shared {
clang: true,
cppflags: [
- "-std=c++1y",
"-Weverything",
"-Werror",