From 65928af6c9ebf46abcd4fbd908fc76137e9843cd Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 5 Apr 2019 20:34:50 -0700 Subject: protos: Merge plugin_proto crate under protos::plugin This de-duplicates the two separate build.rs files dealing with proto compilation. The trunks interface.proto will be exposed under protos::trunks and the plugin proto will be exposed under protos::plugin. BUG=none TEST=cargo check TEST=cargo check --features tpm TEST=cargo check --features plugin TEST=cargo check --features tpm,plugin TEST=FEATURES=test emerge-nami crosvm TEST=FEATURES=test USE=crosvm-tpm emerge-nami crosvm TEST=FEATURES=test USE=crosvm-plugin emerge-nami crosvm TEST=FEATURES=test USE='crosvm-tpm crosvm-plugin' emerge-nami crosvm TEST=local kokoro CQ-DEPEND=CL:1553971 Change-Id: I203b654a38e9d671a508156ae06dfb6f70047c4f Reviewed-on: https://chromium-review.googlesource.com/1556417 Commit-Ready: ChromeOS CL Exonerator Bot Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: Daniel Verkamp --- crosvm_plugin/Cargo.toml | 2 +- crosvm_plugin/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crosvm_plugin') diff --git a/crosvm_plugin/Cargo.toml b/crosvm_plugin/Cargo.toml index 379d837..6805898 100644 --- a/crosvm_plugin/Cargo.toml +++ b/crosvm_plugin/Cargo.toml @@ -11,6 +11,6 @@ crate-type = ["cdylib"] kvm = { path = "../kvm" } kvm_sys = { path = "../kvm_sys" } libc = "*" -plugin_proto = { path = "../plugin_proto" } protobuf = "2.3" +protos = { path = "../protos", features = ["plugin"] } sys_util = { path = "../sys_util" } diff --git a/crosvm_plugin/src/lib.rs b/crosvm_plugin/src/lib.rs index ac6b358..8b0a222 100644 --- a/crosvm_plugin/src/lib.rs +++ b/crosvm_plugin/src/lib.rs @@ -6,7 +6,7 @@ //! This module implements the dynamically loaded client library API used by a crosvm plugin, //! defined in `crosvm.h`. It implements the client half of the plugin protocol, which is defined in -//! the plugin_proto module. +//! the `protos::plugin` module. //! //! To implement the `crosvm.h` C API, each function and struct definition is repeated here, with //! concrete definitions for each struct. Most functions are thin shims to the underlying object @@ -18,8 +18,8 @@ extern crate kvm; extern crate kvm_sys; extern crate libc; -extern crate plugin_proto; extern crate protobuf; +extern crate protos; extern crate sys_util; use std::env; @@ -50,7 +50,7 @@ use kvm_sys::{ kvm_vcpu_events, kvm_xcrs, }; -use plugin_proto::*; +use protos::plugin::*; // Needs to be large enough to receive all the VCPU sockets. const MAX_DATAGRAM_FD: usize = 32; -- cgit 1.4.1