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

Commit 3a20fcd0 authored by Andrew Walbran's avatar Andrew Walbran Committed by Automerger Merge Worker
Browse files

Merge "Make dependencies explicit." am: 1b2f9cbc 

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



Change-Id: I40fa97e4584f45aab8399c2af986e1fedfa98e30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99e2b332 1b2f9cbc

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

+1 −0
Original line number Diff line number Diff line 
use lazy_static::lazy_static;

use log::{error, info};

use paste::paste;

use std::collections::HashMap;

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

+0 −2
Original line number Diff line number Diff line 
//! Bluetooth common library

#[macro_use]

extern crate lazy_static;



/// Provides waking timer abstractions

pub mod time;

system/gd/rust/facade/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ rust_binary { 
      "libbluetooth_with_facades",

      "libfutures",

      "libgrpcio",

      "liblazy_static",

      "libtokio",

      "libnix",

      "libbt_common",

system/gd/rust/facade/src/main.rs

+2 −7
Original line number Diff line number Diff line 
//! Starts the facade services that allow us to test the Bluetooth stack



#[macro_use]

extern crate clap;

use clap::{App, Arg};



#[macro_use]

extern crate lazy_static;



use bluetooth_with_facades::RootFacadeService;

use clap::{value_t, App, Arg};

use futures::channel::mpsc;

use futures::executor::block_on;

use futures::stream::StreamExt;

use grpcio::*;

use lazy_static::lazy_static;

use log::debug;

use nix::sys::signal;

use std::sync::{Arc, Mutex};

system/gd/rust/facade_proto/build.rs

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
//  See the License for the specific language governing permissions and

//  limitations under the License.



extern crate protobuf_codegen;

extern crate protoc_grpcio;

extern crate protoc_rust;