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.toml | |
| 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.toml')
| -rw-r--r-- | Cargo.toml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml index 27b128c..6baf7e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ exclude = [ default-no-sandbox = [] gpu = ["devices/gpu"] gpu-forward = ["render_node_forward"] -plugin = ["plugin_proto", "crosvm_plugin", "protobuf"] +plugin = ["protos/plugin", "crosvm_plugin", "protobuf"] sandboxed-libusb = ["devices/sandboxed-libusb", "vm_control/sandboxed-libusb"] tpm = ["devices/tpm"] wl-dmabuf = ["devices/wl-dmabuf", "gpu_buffer", "resources/wl-dmabuf"] @@ -49,8 +49,8 @@ libcras = "*" msg_socket = { path = "msg_socket" } net_util = { path = "net_util" } p9 = { path = "p9" } -plugin_proto = { path = "plugin_proto", optional = true } protobuf = { version = "2.3", optional = true } +protos = { path = "protos", optional = true } qcow = { path = "qcow" } rand_ish = { path = "rand_ish" } render_node_forward = { path = "render_node_forward", optional = true } |