commit 432911091c487d52f0ddc708b0d30db6d3dcae74
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jul 18 22:07:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 18 22:07:22 2018 +0000
tree 0d03a1c3902357e43794e4994b51372bcf1f7a9b
parent 4d29392c7fb268e0210db4146f151d40502eff33
parent 98010cd20f631215fc2bc6acb8eea25ec3557aa6

Merge "Do not block on allocating buffers am: 0a3e784701" into pi-dev-plus-aosp

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