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

Commit b42c10b2 authored by Alix's avatar Alix Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Moved contents of clang_cflags into cflags am: 0aeb633b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2069670



Change-Id: I8e667248de874973482258cb8d452503947bacbd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ebe9315 0aeb633b

system/build/Android.bp

+13 −7
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ fluoride_defaults { 
    name: "fluoride_types_defaults",

    defaults: [

        "fluoride_types_defaults_fuzzable",

        "libchrome_support_defaults"

        "libchrome_support_defaults",

    ],

}
@@ -83,15 +83,18 @@ fluoride_defaults { 
        host: {

            static_libs: [

                "libcutils",

            ]

        }

            ],

        },

    },

    defaults: ["fluoride_types_defaults_fuzzable"],

    header_libs: ["libbluetooth_headers", "libbt_callbacks_cxx_headers"],

    header_libs: [

        "libbluetooth_headers",

        "libbt_callbacks_cxx_headers",

    ],

    generated_headers: [

        "libbt_shim_bridge_header",

        "libbt_message_loop_thread_bridge_header",

        "cxx-bridge-header"

        "cxx-bridge-header",

    ],

    include_dirs: ["packages/modules/Bluetooth/system/gd/rust/shim"],

    static_libs: [
@@ -108,7 +111,10 @@ fluoride_defaults { 


fluoride_defaults {

    name: "fluoride_defaults",

    defaults: ["fluoride_defaults_fuzzable", "fluoride_types_defaults"],

    defaults: [

        "fluoride_defaults_fuzzable",

        "fluoride_types_defaults",

    ],

    static_libs: [

        "libbluetooth_gd",

        "libbluetooth_rust_interop",
@@ -147,7 +153,7 @@ cc_defaults { 
    name: "clang_file_coverage",

    target: {

        glibc: {

            clang_cflags: [

            cflags: [

                "-fprofile-instr-generate",

                "-fcoverage-mapping",

            ],

system/gd/Android.bp

+23 −14
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ cc_defaults { 
    name: "gd_clang_file_coverage",

    target: {

        glibc: {

            clang_cflags: [

            cflags: [

                "-fprofile-instr-generate",

                "-fcoverage-mapping",

            ],
@@ -303,7 +303,7 @@ cc_binary { 
    sanitize: {

        address: true,

        cfi: true,

    }

    },

}



cc_test {
@@ -573,7 +573,10 @@ rust_library { 
    name: "libbt_packets",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_packets",

    srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"],

    srcs: [

        "rust/packets/lib.rs",

        ":BluetoothGeneratedPackets_rust",

    ],

    edition: "2018",

    vendor_available : true,

    host_supported: true,
@@ -594,7 +597,10 @@ rust_library { 
rust_test_host {

    name: "libbt_packets_test",

    defaults: ["gd_rust_defaults"],

    srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"],

    srcs: [

        "rust/packets/lib.rs",

        ":BluetoothGeneratedPackets_rust",

    ],

    test_suites: ["general-tests"],

    edition: "2018",

    proc_macros: ["libnum_derive"],
@@ -624,7 +630,10 @@ genrule { 
rust_test_host {

    name: "packets_test_rust",

    defaults: ["gd_rust_defaults"],

    srcs: ["rust/packets/test_lib.rs", ":TestGeneratedPackets_rust"],

    srcs: [

        "rust/packets/test_lib.rs",

        ":TestGeneratedPackets_rust",

    ],

    test_suites: ["general-tests"],

    edition: "2018",

    proc_macros: ["libnum_derive"],