diff options
| author | David Tolnay <dtolnay@chromium.org> | 2019-04-05 20:34:50 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-12 14:49:57 -0700 |
| commit | 65928af6c9ebf46abcd4fbd908fc76137e9843cd (patch) | |
| tree | 5aaacc0e15f10031d09de71dd81c6b5c1e254a81 /Cargo.lock | |
| parent | 1aca8b72694fcbefc4f31bf49f41e7491ad29db4 (diff) | |
| download | crosvm-65928af6c9ebf46abcd4fbd908fc76137e9843cd.tar crosvm-65928af6c9ebf46abcd4fbd908fc76137e9843cd.tar.gz crosvm-65928af6c9ebf46abcd4fbd908fc76137e9843cd.tar.bz2 crosvm-65928af6c9ebf46abcd4fbd908fc76137e9843cd.tar.lz crosvm-65928af6c9ebf46abcd4fbd908fc76137e9843cd.tar.xz crosvm-65928af6c9ebf46abcd4fbd908fc76137e9843cd.tar.zst crosvm-65928af6c9ebf46abcd4fbd908fc76137e9843cd.zip | |
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 <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: David Tolnay <dtolnay@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock index 19667d1..eab4e90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,8 +100,8 @@ dependencies = [ "msg_socket 0.1.0", "net_util 0.1.0", "p9 0.1.0", - "plugin_proto 0.17.0", "protobuf 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "protos 0.1.0", "qcow 0.1.0", "rand_ish 0.1.0", "render_node_forward 0.1.0", @@ -120,8 +120,8 @@ dependencies = [ "kvm 0.1.0", "kvm_sys 0.1.0", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "plugin_proto 0.17.0", "protobuf 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "protos 0.1.0", "sys_util 0.1.0", ] @@ -327,16 +327,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "plugin_proto" -version = "0.17.0" -dependencies = [ - "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "kvm_sys 0.1.0", - "protobuf 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "protoc-rust 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "poll_token_derive" version = "0.1.0" dependencies = [ @@ -389,6 +379,7 @@ dependencies = [ name = "protos" version = "0.1.0" dependencies = [ + "kvm_sys 0.1.0", "protobuf 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "protoc-rust 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] |