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

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

Merge "Change request for Rust v1.64.0" am: a4af3246 

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



Change-Id: I938b460292db918ca00b3dcf41dd93bfdce29925
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a05258f a4af3246

system/gd/rust/shim/src/bridge.rs

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ pub use crate::hci::*; 
pub use crate::stack::*;



#[cxx::bridge(namespace = bluetooth::shim::rust)]

#[allow(unused_must_use)]

pub mod ffi {

    extern "Rust" {

        type Stack;

system/gd/rust/shim/src/message_loop_thread.rs

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use tokio::runtime::Runtime; 
use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};



#[cxx::bridge(namespace = bluetooth::shim::rust)]

#[allow(unused_must_use)]

mod ffi {

    unsafe extern "C++" {

        include!("callbacks/callbacks.h");