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

Commit 4591f2db authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "C++17 is the default now." am: a7f54b15 

am: e2d54348

Change-Id: I31476f913b38221da2a9ebd0c8f00225dcfa93a5
parents 6e94f244 e2d54348

adb/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ cc_defaults { 
        "-Wvla",

    ],

    rtti: true,

    cpp_std: "gnu++17",



    use_version_lib: true,
@@ -72,7 +71,7 @@ cc_defaults { 
                "-DUNICODE=1",

                "-D_UNICODE=1",



                // -std=gnu++11 doesn't set _GNU_SOURCE on Windows.

                // Unlike on Linux, -std=gnu++ doesn't set _GNU_SOURCE on Windows.

                "-D_GNU_SOURCE",



                // MinGW hides some things behind _POSIX_SOURCE.

debuggerd/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ cc_defaults { 
        "-Wno-nullability-completeness",

        "-Os",

    ],

    cpp_std: "gnu++17",



    local_include_dirs: ["include"],

}

fastboot/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -144,8 +144,6 @@ cc_binary { 
    static_libs: [

        "libhealthhalutils",

    ],



    cpp_std: "c++17",

}



cc_defaults {
@@ -212,7 +210,6 @@ cc_library_host_static { 
    name: "libfastboot",

    defaults: ["fastboot_host_defaults"],



    cpp_std: "c++17",

    srcs: [

        "bootimg_utils.cpp",

        "fastboot.cpp",

fs_mgr/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ cc_defaults { 
        "-Werror",

        "-Wno-unused-variable",

    ],

    cppflags: [

        "-std=gnu++1z",

    ],

}



cc_library {

init/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ init_cflags += \ 
    -Wall -Wextra \

    -Wno-unused-parameter \

    -Werror \

    -std=gnu++1z \



# --