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

Commit c370c446 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge changes I5d0c9f45,I847253d5,I05ec50c5,I4d55a4b3 am: 981fdb24 am: ee986a19 am: 5bb78dfa 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1534151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9399ad6cdebf3e9d2337adc126128afe188b6eb
parents aa113564 5bb78dfa

system/audio_hal_interface/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ cc_library_static { 
        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btif/include",

        "packages/modules/Bluetooth/system/stack/include",

        "packages/modules/Bluetooth/system/gd/rust/shim",

    ],

    srcs: [

        "a2dp_encoding.cc",

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ cc_defaults { 
        "packages/modules/Bluetooth/system/udrv/include",

        "packages/modules/Bluetooth/system/vnd/include",

        "packages/modules/Bluetooth/system/utils/include",

        "packages/modules/Bluetooth/system/gd/rust/shim",

    ],

    shared_libs: [

        "libcutils",

system/bta/test/bta_hf_client_test.cc

+2 −1
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@ 


#include "bta/hf_client/bta_hf_client_int.h"

#include "bta/include/bta_hf_client_api.h"

#include "common/message_loop_thread.h"



namespace base {

class MessageLoop;

}  // namespace base



base::MessageLoop* get_main_message_loop() { return NULL; }

bluetooth::common::MessageLoopThread* get_main_thread() { return nullptr; }



namespace {

const RawAddress bdaddr1({0x11, 0x22, 0x33, 0x44, 0x55, 0x66});

system/btif/test/btif_rc_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ bt_status_t do_in_jni_thread(const base::Location& from_here, 
                             base::OnceClosure task) {

  return BT_STATUS_SUCCESS;

}

base::MessageLoop* get_main_message_loop() { return nullptr; }

bluetooth::common::MessageLoopThread* get_main_thread() { return nullptr; }

bool interop_match_addr(const interop_feature_t feature,

                        const RawAddress* addr) {

  return false;

system/build/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -70,10 +70,20 @@ fluoride_defaults { 
        },

    },

    defaults: ["fluoride_types_defaults_fuzzable"],

    header_libs: ["libbluetooth_headers"],

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

    generated_headers: [

        "libbt_hci_bridge_header",

        "libbt_message_loop_thread_bridge_header",

        "cxx-bridge-header"

    ],

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

    static_libs: [

        "libbluetooth-types",

        "libbt-platform-protos-lite",

        "libbluetooth_rust_interop",

        "liblog",

        "libcutils",

        "libbt_shim_ffi",

    ],

    cpp_std: "c++17",

    sanitize: {