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

Commit 3726f9c5 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Move c_std and cpp_std to bluetooth_cflags" into main

parents bf1785b4 19954d1d

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ cc_defaults { 
        // there are too many unused parameters in all the code.

        "-Wno-unused-parameter",

    ],

    c_std: "c99",

    cpp_std: "c++17",

}



// Address Sanitizer is flaky on Android x86_64 binaries but it's not on x86

system/build/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ cc_defaults { 
        // struct BT_HDR is defined as a variable-size header in a struct.

        "-Wno-gnu-variable-sized-type-not-at-end",

    ],

    c_std: "c99",

    product_variables: {

        debuggable: {

            cflags: [
@@ -57,7 +56,6 @@ cc_defaults { 
        "libbt_shim_bridge",

        "libbt_shim_ffi",

    ],

    cpp_std: "c++17",

    min_sdk_version: "current",

}

system/gd/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ cc_defaults { 
            enabled: false,

        },

    },

    cpp_std: "c++17",

    cflags: [

        "-DEXPORT_SYMBOL=__attribute__((visibility(\"default\")))",

        "-DGOOGLE_PROTOBUF_NO_RTTI",
@@ -38,7 +37,6 @@ cc_defaults { 
        "-Wno-unused-result",

        "-fvisibility=hidden",

    ],

    c_std: "c99",

    header_libs: ["jni_headers"],

}

system/gd/dumpsys/bundler/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ genrule { 
cc_defaults {

    name: "bluetooth_flatbuffer_bundler_defaults",

    defaults: ["bluetooth_cflags"],

    cpp_std: "c++17",

    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

    ],

system/gd/rust/topshim/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ rust_bindgen { 
    crate_name: "bt_topshim_wrapper_bindgen",

    source_stem: "bindings",

    defaults: ["bluetooth_cflags"],

    cpp_std: "c++17",

    c_std: "",

    host_supported: true,

    bindgen_flags: [

        "--allowlist-function=bt_.*",