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

Commit f96a0eaa authored by Matthew Maurer's avatar Matthew Maurer Committed by Gerrit Code Review
Browse files

Merge "Update to use CXX 1.0"

parents 39cd4317 eb31bee3

system/bta/BUILD.gn

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static_library("bta") { 
  ]



  deps = [

    "//bt/gd/rust/shim:hci_bridge_header",

    "//bt/gd/rust/shim:shim_bridge_header",

    "//bt/gd/rust/shim:init_flags_bridge_header",

    "//bt/gd/rust/shim:message_loop_thread_bridge_header",

  ]

system/build/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ fluoride_defaults { 
    defaults: ["fluoride_types_defaults_fuzzable"],

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

    generated_headers: [

        "libbt_hci_bridge_header",

        "libbt_shim_bridge_header",

        "libbt_message_loop_thread_bridge_header",

        "cxx-bridge-header"

    ],

system/gd/rust/common/src/sys_prop.rs

+11 −6
Original line number Diff line number Diff line 
//! System properties on Android



#[cfg(target_os = "android")]

mod wrap {

    #[cxx::bridge(namespace = bluetooth::common::sys_prop)]

mod ffi {

    extern "C" {

    pub mod ffi {

        unsafe extern "C++" {

            include!("src/ffi/sys_prop.h");

            fn get(name: &str) -> String;

        }

    }

}



#[cfg(target_os = "android")]

use wrap::ffi;



/// Gets the value of a system property on Android

#[cfg(target_os = "android")]
@@ -43,7 +48,7 @@ pub fn get_bool(name: &str) -> Option<bool> { 
        match value.as_str() {

            "0" | "n" | "no" | "false" | "off" => Some(false),

            "1" | "y" | "yes" | "true" | "on" => Some(true),

            _ => None

            _ => None,

        }

    } else {

        None

system/gd/rust/hal/src/ffi/hidl.cc

+4 −4
Original line number Diff line number Diff line
@@ -99,22 +99,22 @@ void stop_hal() { 
  trampoline_ = nullptr;

}



void send_command(rust::Slice<uint8_t> data) {

void send_command(rust::Slice<const uint8_t> data) {

  ASSERT(bt_hci_ != nullptr);

  bt_hci_->sendHciCommand(hidl_vec<uint8_t>(data.data(), data.data() + data.length()));

}



void send_acl(rust::Slice<uint8_t> data) {

void send_acl(rust::Slice<const uint8_t> data) {

  ASSERT(bt_hci_ != nullptr);

  bt_hci_->sendAclData(hidl_vec<uint8_t>(data.data(), data.data() + data.length()));

}



void send_sco(rust::Slice<uint8_t> data) {

void send_sco(rust::Slice<const uint8_t> data) {

  ASSERT(bt_hci_ != nullptr);

  bt_hci_->sendScoData(hidl_vec<uint8_t>(data.data(), data.data() + data.length()));

}



void send_iso(rust::Slice<uint8_t> data) {

void send_iso(rust::Slice<const uint8_t> data) {

  if (bt_hci_1_1_ == nullptr) {

    LOG_ERROR("ISO is not supported in HAL v1.0");

    return;

system/gd/rust/hal/src/ffi/hidl.h

+4 −4
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ namespace hal { 


void start_hal();

void stop_hal();

void send_command(rust::Slice<uint8_t> data);

void send_acl(rust::Slice<uint8_t> data);

void send_sco(rust::Slice<uint8_t> data);

void send_iso(rust::Slice<uint8_t> data);

void send_command(rust::Slice<const uint8_t> data);

void send_acl(rust::Slice<const uint8_t> data);

void send_sco(rust::Slice<const uint8_t> data);

void send_iso(rust::Slice<const uint8_t> data);



}  // namespace hal

}  // namespace bluetooth