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

Commit 35deca26 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "C++17 is the default now." am: d1842c43 am: 5c567684 

am: 239debf1

Change-Id: I81b42007d9a2688b0a67109dc1b399673b9c6d50
parents face1763 239debf1

libs/binder/ndk/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -39,8 +39,6 @@ cc_library { 
        "libutils",

        "libutils",

    ],

    ],





    cpp_std: "c++17",



    version_script: "libbinder_ndk.map.txt",

    version_script: "libbinder_ndk.map.txt",

}

}

libs/binder/ndk/test/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ cc_defaults { 
    strip: {

    strip: {

        none: true,

        none: true,

    },

    },

    cpp_std: "c++17",

    cflags: [

    cflags: [

        "-O0",

        "-O0",

        "-g",

        "-g",

libs/input/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




cc_library {

cc_library {

    name: "libinput",

    name: "libinput",

    cpp_std: "c++17",

    host_supported: true,

    host_supported: true,

    cflags: [

    cflags: [

        "-Wall",

        "-Wall",

libs/nativewindow/Android.bp

+0 −4
Original line number Original line Diff line number Diff line
@@ -51,10 +51,6 @@ cc_library { 
        "-Wno-unused-function",

        "-Wno-unused-function",

    ],

    ],





    cppflags: [

        "-std=c++1z"

    ],



    version_script: "libnativewindow.map.txt",

    version_script: "libnativewindow.map.txt",





    srcs: [

    srcs: [

libs/vr/libvrflinger/Android.bp

+0 −3
Original line number Original line Diff line number Diff line
@@ -85,9 +85,6 @@ cc_library_static { 
        "-Wno-error=sign-compare", // to fix later

        "-Wno-error=sign-compare", // to fix later

        "-Wno-unused-variable",

        "-Wno-unused-variable",

    ],

    ],

    cppflags: [

        "-std=c++1z"

    ],

    shared_libs: sharedLibraries,

    shared_libs: sharedLibraries,

    whole_static_libs: staticLibraries,

    whole_static_libs: staticLibraries,

    header_libs: headerLibraries,

    header_libs: headerLibraries,