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

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

Merge "rusty-gd: rename interop to ffi" am: 54e60da0 am: d7faf7b8 am: 7bb7d0c4 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14420e536dfce569423a7bd233b9194a36001b09
parents b189e66b 7bb7d0c4

system/gd/rust/hal/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ genrule { 
cc_library_static {

    name: "libbt_hidl_hal_cxx",

    defaults: ["gd_ffi_defaults"],

    srcs: ["src/hidl/interop.cc"],

    local_include_dirs: ["src/hidl"],

    srcs: ["src/ffi/hidl.cc"],

    local_include_dirs: ["src/ffi"],

    generated_headers: ["libbt_hidl_hal_bridge_header", "cxx-bridge-header"],

    generated_sources: ["libbt_hidl_hal_bridge_code"],

    shared_libs: [

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <stdlib.h>



#include "../../os/log.h"

#include "src/hidl/interop.h"

#include "src/ffi/hidl.h"



using ::android::hardware::hidl_vec;

using ::android::hardware::Return;

system/gd/rust/hal/src/hidl_hal.rs

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ async fn provide_hidl_hal(rt: Arc<Runtime>) -> RawHalExports { 
#[cxx::bridge(namespace = bluetooth::hal)]

mod ffi {

    extern "C" {

        include!("src/hidl/interop.h");

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

        fn start_hal();

        fn stop_hal();

        fn send_command(data: &[u8]);