commit d39da4944fbf89600cfdc0a611cbc28a95cd4872
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 09 16:08:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 09 16:08:24 2018 +0000
tree f86fc210a70002f895dd4d846eb871db7d1d60f1
parent 7e3e5b6868dbf6a471bf6b8b7bd3f28ab8ff0bba
parent 6c3feee39e85c7453c22815bdcad4034282ac624

Merge "C++14 has been the default for a while now."

vulkan/nulldrv/Android.bp

diff --git a/vulkan/nulldrv/Android.bp b/vulkan/nulldrv/Android.bp
index 3329609..7be9c66 100644
--- a/vulkan/nulldrv/Android.bp
+++ b/vulkan/nulldrv/Android.bp
@@ -32,7 +32,6 @@
         "-DLOG_NDEBUG=0",
     ],
     cppflags: [
-        "-std=c++1y",
         "-Wno-c++98-compat-pedantic",
         "-Wno-c99-extensions",
     ],

vulkan/tools/Android.bp

diff --git a/vulkan/tools/Android.bp b/vulkan/tools/Android.bp
index d81d9ec..2514094 100644
--- a/vulkan/tools/Android.bp
+++ b/vulkan/tools/Android.bp
@@ -29,7 +29,6 @@
         "-Wno-switch-enum",
     ],
     cppflags: [
-        "-std=c++1y",
         "-Wno-c++98-compat-pedantic",
         "-Wno-c99-extensions",
         "-Wno-old-style-cast",