commit 5e86147abcba8f0ca9171000e60cfc6db1afc116
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 13 23:08:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 13 23:08:57 2016 +0000
tree cb52f780bc94d8094997a4faf34efd78ae5a6f14
parent 8fee401726f27cc83994c8a74a9940cf4099c29e
parent 199adbc1c8953b50500dabd92feecc7a431f799b

Merge "Remove EGL Hibernation"

cmds/atrace/atrace.rc

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index c2f8891..e3cc9da 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -1,6 +1,6 @@
 ## Permissions to allow system-wide tracing to the kernel trace buffer.
 ##
-on boot
+on fs
 
 # Allow writing to the kernel trace log.
     chmod 0222 /sys/kernel/debug/tracing/trace_marker

libs/gui/Android.mk

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

libs/ui/Android.bp

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",