Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 088bf6b8 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "The platform default is already newer than C++11." 

am: 287ce43d

Change-Id: I7c9abcc38c497f966632415e1ec70fa60e50cf1f
parents f3aff3c1 287ce43d

services/vr/virtual_touchpad/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ cc_library { 
    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 @@ cc_test { 
        "-Wall",

        "-Werror",

    ],

    cppflags: [

        "-std=c++11",

    ],

    host_ldlibs: [

        "-llog",

    ],
@@ -86,7 +82,6 @@ cc_binary { 
    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 @@ cc_library { 
    srcs: client_src,

    shared_libs: client_shared_libs,

    header_libs: header_libraries,

    cppflags: ["-std=c++11"],

    cflags: [

        "-DLOG_TAG=\"VirtualTouchpadClient\"",

        "-Wall",