From a1d2ceaf45e56b1a6a8af60c0e8b3743d8d50596 Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Thu, 10 Dec 2020 09:51:18 -0800 Subject: [PATCH] rusty-gd: rename interop to ffi be more consistent Bug: 171749953 Tag: #gd-refactor Test: gd/cert/run --rhost SimpleHalTest Change-Id: Ide822c27c2c06dec0a9d89d09d8e20344d7ff8cb --- gd/rust/hal/Android.bp | 4 ++-- gd/rust/hal/src/{hidl/interop.cc => ffi/hidl.cc} | 2 +- gd/rust/hal/src/{hidl/interop.h => ffi/hidl.h} | 0 gd/rust/hal/src/hidl_hal.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename gd/rust/hal/src/{hidl/interop.cc => ffi/hidl.cc} (98%) rename gd/rust/hal/src/{hidl/interop.h => ffi/hidl.h} (100%) diff --git a/gd/rust/hal/Android.bp b/gd/rust/hal/Android.bp index b3ecf8c09..aaa281f41 100644 --- a/gd/rust/hal/Android.bp +++ b/gd/rust/hal/Android.bp @@ -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: [ diff --git a/gd/rust/hal/src/hidl/interop.cc b/gd/rust/hal/src/ffi/hidl.cc similarity index 98% rename from gd/rust/hal/src/hidl/interop.cc rename to gd/rust/hal/src/ffi/hidl.cc index 29b428eb9..8a46c8d0b 100644 --- a/gd/rust/hal/src/hidl/interop.cc +++ b/gd/rust/hal/src/ffi/hidl.cc @@ -4,7 +4,7 @@ #include #include "../../os/log.h" -#include "src/hidl/interop.h" +#include "src/ffi/hidl.h" using ::android::hardware::hidl_vec; using ::android::hardware::Return; diff --git a/gd/rust/hal/src/hidl/interop.h b/gd/rust/hal/src/ffi/hidl.h similarity index 100% rename from gd/rust/hal/src/hidl/interop.h rename to gd/rust/hal/src/ffi/hidl.h diff --git a/gd/rust/hal/src/hidl_hal.rs b/gd/rust/hal/src/hidl_hal.rs index a08f41950..9faf29151 100644 --- a/gd/rust/hal/src/hidl_hal.rs +++ b/gd/rust/hal/src/hidl_hal.rs @@ -36,7 +36,7 @@ async fn provide_hidl_hal(rt: Arc) -> 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]); -- 2.11.0