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

Commit e3228d29 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge changes I3a270e9b,I53ea156f,I618a4551,Ic4233b95,Ie36c3674 into main am: c8e1d15f 

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



Change-Id: I6c971f2b745d265f1a9ee7cb67ad86a4a408f951
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 138e11b1 c8e1d15f

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ cc_library_shared { 
        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtcore",

        "libbtdevice",

        "libbte",

system/audio_hal_interface/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ cc_library_static { 
    ],

    static_libs: [

        "libbt-common",

        "libbt_shim_bridge",

        "libosi",

    ],

    target: {
@@ -71,6 +72,7 @@ cc_library_static { 
        "com.android.btservices",

    ],

    min_sdk_version: "Tiramisu",

    header_libs: ["libbluetooth_headers"],

}



// Bluetooth Audio client interface library unit tests for target and host
@@ -99,9 +101,11 @@ cc_test { 
    static_libs: [

        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

    ],

    cflags: [

        "-DBUILDCFG",

    ],

    header_libs: ["libbluetooth_headers"],

}

system/bta/Android.bp

+37 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ cc_library_static { 
        "lib-bt-packets",

        "libbluetooth_gd",

        "libbt-bta-core",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libcom.android.sysprop.bluetooth",

    ],

    shared_libs: [
@@ -190,6 +192,8 @@ cc_library_static { 
    ],

    static_libs: [

        "lib-bt-packets",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libcom.android.sysprop.bluetooth",

    ],

    apex_available: [
@@ -244,6 +248,8 @@ cc_test { 
        "libbt-bta",

        "libbt-bta-core",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbtcore",

        "libchrome",

        "libcom.android.sysprop.bluetooth",
@@ -290,6 +296,8 @@ cc_test { 
        "libbt-bta",

        "libbt-bta-core",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbtcore",

        "libchrome",

        "libosi",
@@ -406,6 +414,8 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbtcore",

        "libbtdevice",

        "libchrome",
@@ -465,8 +475,10 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -509,8 +521,10 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -564,8 +578,11 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -707,8 +724,10 @@ cc_test { 
        "liblog", // __android_log_print

    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -718,6 +737,7 @@ cc_test { 
    sanitize: {

        cfi: false,

    },

    header_libs: ["libbluetooth_headers"],

}



cc_test {
@@ -800,8 +820,10 @@ cc_test { 
        "liblog", // __android_log_print

    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -811,6 +833,7 @@ cc_test { 
    sanitize: {

        cfi: false,

    },

    header_libs: ["libbluetooth_headers"],

}



cc_test {
@@ -872,9 +895,12 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -935,8 +961,10 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -989,8 +1017,10 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

    ],
@@ -1052,8 +1082,10 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "libbluetooth-types",

        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libgmock",
@@ -1112,8 +1144,10 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

    ],
@@ -1174,8 +1208,11 @@ cc_test { 
    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

system/btcore/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ cc_library_static { 
            cflags: ["-D_GNU_SOURCE"],

        },

    },

    static_libs: ["libbt_shim_bridge"],

}



cc_library_static {
@@ -65,6 +66,7 @@ cc_library_static { 
    ],

    defaults: ["libbtcore_defaults"],

    min_sdk_version: "Tiramisu",

    static_libs: ["libbt_shim_bridge"],

}



cc_library_headers {
@@ -100,6 +102,7 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "libbluetooth-types",

        "libbtcore",

        "libchrome",

        "libosi",
@@ -111,4 +114,5 @@ cc_test { 
    sanitize: {

        address: true,

    },

    header_libs: ["libbluetooth_headers"],

}

system/btif/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -145,9 +145,12 @@ cc_library_static { 
        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbluetooth-types",

        "libbt-audio-hal-interface",

        "libbt-platform-protos-lite",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtif-core",

    ],

    shared_libs: [
@@ -226,7 +229,9 @@ cc_library_static { 
        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",

        "libbt-audio-hal-interface",

        "libbt-platform-protos-lite",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libstatslog_bt",

    ],

    shared_libs: [
@@ -242,6 +247,7 @@ cc_library_static { 
    ],

    host_supported: true,

    min_sdk_version: "Tiramisu",

    header_libs: ["libbluetooth_headers"],

}



// btif unit tests for target
@@ -293,6 +299,7 @@ cc_test { 
        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtcore",

        "libbtdevice",

        "libbtif",
@@ -346,6 +353,7 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt_shim_bridge",

        "libchrome",

        "libosi",

    ],
@@ -378,6 +386,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libchrome",

        "libosi",

    ],
@@ -416,6 +425,8 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

    ],
@@ -459,6 +470,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libc++fs",

        "libchrome",

        "libgmock",
@@ -495,6 +507,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libosi",
@@ -597,10 +610,12 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-platform-protos-lite",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtdevice",

        "libbtif",

        "libbtif-core",
@@ -731,8 +746,10 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-platform-protos-lite",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt_shim_bridge",

        "libbtdevice",

        "libbtif",

        "libbtif-core",