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

Commit 4431d9d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Format blueprints with bpfmt -s" am: 151c2b01 

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



Change-Id: Ie5f446fe285fab16f19aa5691c0118fdb54ce2a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5eb1d8ae 151c2b01

android/app/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ cc_library_shared { 
        "packages/modules/Bluetooth/system/types",

    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libc++fs",

system/bta/Android.bp

+10 −9
Original line number Diff line number Diff line
@@ -235,15 +235,15 @@ cc_test { 
    name: "net_test_bta_security",

    defaults: [

        "fluoride_bta_defaults",

        "mts_defaults"

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    srcs: [

        ":TestCommonLogMsg",

        ":TestCommonMockFunctions",

        ":TestMockBtif",

        ":TestMockDevice",

        ":TestMockStack",

	":TestMockBtif",

        ":TestCommonLogMsg",

        "test/bta_hf_client_security_test.cc",

    ],

    shared_libs: [
@@ -255,16 +255,17 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbtcore",

        "libbluetooth-types",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",

        "libbt-audio-hal-interface",

        "libbluetooth-types",

        "libbt-common",

        "libbt-protos-lite",

        "libbtcore",

        "libosi",

        "libbt-common",

    ],

}



cc_test {

    name: "bt_host_test_bta",

    defaults: [

system/build/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ cc_defaults { 
    defaults: ["fluoride_common_options"],

    cflags: [

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

        "-fvisibility=hidden",

        "-DLOG_NDEBUG=1",

        "-fvisibility=hidden",

        // struct BT_HDR is defined as a variable-size header in a struct.

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

    ],

system/gd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -428,10 +428,10 @@ cc_test { 
        "libbluetooth_gd_unit_tests",

        "libbluetooth_rust_interop",

        "libbt-platform-protos-lite",

        "libbt-platform-protos-lite",

        "libbt_callbacks_cxx",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbt-platform-protos-lite",

        "libc++fs",

        "libflatbuffers-cpp",

        "libgmock",

system/gd/rust/topshim/facade/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ rust_defaults { 
        "-fsanitize=undefined",

    ],

    rustlibs: [

        "libbluetooth_rs",

        "libbluetooth_core_rs_for_facade",

        "libbluetooth_rs",

        "libbt_common",

        "libbt_facade_helpers",

        "libbt_packets",