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

Commit d8da05bd authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Gerrit Code Review
Browse files

Merge "Add rust binaries to link with C++ staticlib"

parents 321803cb 83f3ba1f
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ group("all") {
group("bluetooth") {
  deps = [
    "//bt/main:bluetooth",
    "//bt/service:bluetoothtbd",
    "//bt/main:bluetooth-static",
    #"//bt/service:bluetoothtbd",
  ]
}

+6 −42
Original line number Diff line number Diff line
@@ -13,46 +13,10 @@
#  See the License for the specific language governing permissions and
#  limitations under the License.

[package]
name = "bt_shim_ffi"
version = "0.0.1"
edition = "2018"
[workspace]

[dependencies]
# BT dependencies
bt_common = { path = "gd/rust/common" }
bt_facade_helpers = { path = "gd/rust/facade" }
bt_hal = { path = "gd/rust/hal" }
bt_hci = { path = "gd/rust/hci" }
bt_main = { path = "gd/rust/main" }
bt_packets = { path = "gd/rust/packets" }

# All external dependencies. Keep all versions at build/rust/Cargo.toml
bindgen = "0.51"
bytes = "1.0"
cxx = { version = "0.5.9", features = ["c++17"] }
env_logger = "0.8"
futures = "0.3"
grpcio = { version = "0.7", features = ["protobuf", "protobuf-codec", "openssl"] }
grpcio-sys = { version = "*", features = ["openssl"] }
lazy_static = "1.4"
log = "0.4"
nix = "0.19"
num-derive = "0.3"
num-traits = "0.2"
paste = "1.0"
proc-macro2 = "1.0.24"
protobuf = "2.0"
protoc-grpcio = "2.0"
protoc-rust = "2.0"
quote = "1.0.8"
thiserror = "1.0"
syn = { version = "1.0.58", features = ['default', 'full'] }
tokio = { version = "1.0", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'memchr', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }
tokio-stream = "0.1"
walkdir = "2.2"


[lib]
path = "gd/rust/shim/src/lib.rs"
crate-type = ["staticlib"]
members = [
  "gd/rust/shim",
  "gd/rust/linux/mgmt",
  "gd/rust/linux/adapter",
]
+13 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
#  limitations under the License.

[package]
name = "bt_facade_helpers"
name = "bluetooth_with_facades"
version = "0.0.1"
edition = "2018"

@@ -32,6 +32,17 @@ log = "*"
protobuf = "*"
tokio = "*"

# Binary-only deps
clap = "*"
lazy_static = "*"
nix = "*"
bt_common = { path = "../common" }


[[bin]]
name = "bluetooth_with_facades"
path = "src/main.rs"

[lib]
path = "helpers/lib.rs"
path = "src/lib.rs"
crate-type = ["rlib"]
+38 −0
Original line number Diff line number Diff line
#
#  Copyright 2021 Google, Inc.
#
#  Licensed under the Apache License, Version 2.0 (the "License");
#  you may not use this file except in compliance with the License.
#  You may obtain a copy of the License at:
#
#  http://www.apache.org/licenses/LICENSE-2.0
#
#  Unless required by applicable law or agreed to in writing, software
#  distributed under the License is distributed on an "AS IS" BASIS,
#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#  See the License for the specific language governing permissions and
#  limitations under the License.

[package]
name = "bt_facade_helpers"
version = "0.0.1"
edition = "2018"

[dependencies]
# GD bluetooth deps
bt_facade_proto = { path = "../../facade_proto" }
bt_packets = { path = "../../packets" }

# External deps
bytes = "*"
cxx = "*"
futures = "*"
grpcio = "*"
log = "*"
protobuf = "*"
tokio = "*"

[lib]
path = "lib.rs"
crate-type = ["rlib"]
+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ edition = "2018"
[dependencies]
# BT dependencies
bt_common = { path = "../common" }
bt_facade_helpers = { path = "../facade" }
bt_facade_helpers = { path = "../facade/helpers" }
bt_facade_proto = { path = "../facade_proto" }
bt_packets = { path = "../packets" }
gddi = { path = "../gddi" }
Loading