commit 088bf6b8966d9c58714c7cc2a9d107a9a5c0f348
author Elliott Hughes <enh@google.com> Wed Jul 18 14:58:33 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 18 14:58:33 2018 -0700
tree d3cd594f221c81e8cc047ac4474b04f098baeb0a
parent f3aff3c17c4a086149950537fb6ef24e560e4fc1
parent 287ce43dc4322666a55792a03b763baf276d4f1b

Merge "The platform default is already newer than C++11."
am: 287ce43dc4

Change-Id: I7c9abcc38c497f966632415e1ec70fa60e50cf1f

services/vr/virtual_touchpad/Android.bp

diff --git a/services/vr/virtual_touchpad/Android.bp b/services/vr/virtual_touchpad/Android.bp
index bb16c09..0263481 100644
--- a/services/vr/virtual_touchpad/Android.bp
+++ b/services/vr/virtual_touchpad/Android.bp
@@ -22,7 +22,6 @@
     export_include_dirs: ["include"],
     shared_libs: shared_libs,
     header_libs: header_libraries,
-    cppflags: ["-std=c++11"],
     cflags: [
         "-DLOG_TAG=\"VrVirtualTouchpad\"",
         "-Wall",
@@ -51,9 +50,6 @@
         "-Wall",
         "-Werror",
     ],
-    cppflags: [
-        "-std=c++11",
-    ],
     host_ldlibs: [
         "-llog",
     ],
@@ -86,7 +82,6 @@
     static_libs: service_static_libs,
     shared_libs: service_shared_libs,
     header_libs: header_libraries,
-    cppflags: ["-std=c++11"],
     cflags: [
         "-DLOG_TAG=\"VrVirtualTouchpad\"",
         "-Wall",
@@ -118,7 +113,6 @@
     srcs: client_src,
     shared_libs: client_shared_libs,
     header_libs: header_libraries,
-    cppflags: ["-std=c++11"],
     cflags: [
         "-DLOG_TAG=\"VirtualTouchpadClient\"",
         "-Wall",