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

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

Merge "Revert "floss: Refactor build for bt_common tests"" am: 1d33c5b0 am:... 

Merge "Revert "floss: Refactor build for bt_common tests"" am: 1d33c5b0 am: 07326575 am: f1d6782d am: 7eecca87

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



Change-Id: Iac658150f74fe56cee767696de17bc83e795f5cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65d20ea8 7eecca87

system/gd/BUILD.gn

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static_library("libbluetooth_gd") { 
  include_dirs = [ "." ]

  configs += [ ":gd_defaults" ]

  deps = [

    "//bt/system/gd/rust/common:libbt_keystore_cc",

    "//bt/system/gd/rust/topshim:libbluetooth_topshim",

    "//bt/system/gd/rust/shim:libbluetooth_rust_interop",

    "//bt/system/gd:BluetoothGeneratedPackets_h",

system/gd/rust/common/BUILD.gn

+17 −20
Original line number Diff line number Diff line
@@ -15,32 +15,29 @@ 


import("//common-mk/cxxbridge.gni")



static_library("libbt_keystore_cc") {

  complete_static_lib = true

  sources = [ "keystore/fake_bt_keystore.cc" ]

  deps = [

    ":libbt_common_bridge_code"

  ]

rust_library("libbt_common") {

  crate_name = "bt_common"



  configs += ["//bt/system/gd:gd_defaults"]

}

  sources = [ "src/lib.rs" ]



config("rust_common_config") {

  include_dirs = [ "//bt/system/gd/rust/common" ]

  configs = [

    "//bt/system/gd/rust/shim:rust_libs",

    "//bt/system/gd:rust_defaults",

  ]

}



cxxbridge_header("libbt_common_bridge_header") {

  sources = [ "src/bridge.rs" ]

  all_dependent_configs = [ ":rust_common_config" ]

  deps = [ ":cxxlibheader" ]

}

cxxbridge_cc("libbt_common_sys_prop_bridge_code") {

  sources = [ "src/sys_prop.rs" ]



cxxbridge_cc("libbt_common_bridge_code") {

  sources = [ "src/bridge.rs" ]

  deps = [ ":libbt_common_bridge_header" ]

  configs = [ "//bt/system/gd:gd_defaults" ]

}



cxxbridge_libheader("cxxlibheader") {

  deps = []

static_library("libbt_common_sys_prop_cxx") {

  sources = [ "src/ffi/sys_props.cc" ]



  include_dirs = [ "src/ffi" ]



  deps = [ ":libbt_common_sys_prop_bridge_code" ]



  configs += [ "//bt/system/gd:gd_defaults" ]

}

system/gd/rust/common/Cargo.toml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ edition = "2018" 
[dependencies]

cxx = "*"

env_logger = "*"

futures = "0.3.13"

grpcio = "*"

lazy_static = "*"

log = "*"

system/gd/rust/common/build.rs

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
fn main() {

    let target_dir = std::env::var_os("CARGO_TARGET_DIR").unwrap();



    // Link the keystore static lib and make sure to use -lc++

    println!("cargo:rustc-link-lib=static=bt_keystore_cc");

    println!("cargo:rustc-link-search=native={}", target_dir.clone().into_string().unwrap());

    println!("cargo:rustc-link-lib=c++");



    // Re-run if static libs or this file changed.

    println!("cargo:rerun-if-changed={}", target_dir.into_string().unwrap());

    println!("cargo:rerun-if-changed=build.rs");

}