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

Commit 3b452739 authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "[Connection Manager] Move libbluetooth_rs into stack" am: 9bdb1f0b... 

Merge "[Connection Manager] Move libbluetooth_rs into stack" am: 9bdb1f0b am: ffb4c0bc am: ab81f47b am: 90ac3b4c

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



Change-Id: I124ae556e2525dd74e2dc9d504d06c254f54d354
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a0edf23 90ac3b4c

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ cc_library_shared { 
    static_libs: [

        "libbluetooth-types",

        "libbluetooth",

        "libbluetooth_core_rs",

        "libc++fs",

        "libbluetooth_core_rs_bridge",

    ],

system/audio_hal_interface/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ cc_defaults { 
        "libbluetooth-dumpsys",

        "libbluetooth-protos",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_gd",

        "libbluetooth_rust_interop",

        "libbt-audio-hal-interface",
@@ -66,7 +67,6 @@ cc_defaults { 
        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbtcore",

        "libbtdevice",

        "libbte",

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ cc_test { 
        "android.system.suspend.control-V1-ndk",

        "libFraunhoferAAC",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbt-audio-hal-interface",

        "libbt-bta",

        "libbt-bta-core",

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

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ rust_defaults { 
    ],

    rustlibs: [

        "libbluetooth_rs",

        "libbluetooth_core_rs_for_facade",

        "libbt_common",

        "libbt_facade_helpers",

        "libbt_packets",
@@ -45,6 +46,7 @@ rust_defaults { 
        "libaudio-a2dp-hw-utils",

        "libbluetooth-dumpsys",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_gd", // Gabeldorsche

        "libbt-audio-hal-interface",

        "libbt-bta",

system/gd/rust/topshim/facade/src/main.rs

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ mod utils; 
// clippy that is denied on the rust command line so we can't just allow it.

// This is fine for now since bt_shim doesn't export anything

#[allow(unused)]

use bluetooth_core_rs_for_facade::*;

#[allow(unused)]

use bt_shim::*;



fn main() {