mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2024-10-25 05:35:41 +00:00
move qcow_utils to members from dependencies
The qcow_utils crate is not a dependency of crosvm and should not be built in the same phase as crosvm. Doing so was harmless before the recent rustc/cargo changes, which seem to be triggering some kind of race condition. This change works around the bug. CQ-DEPEND=CL:1336738 TEST=cargo test --release BUG=chromium:900366 Change-Id: I01048128b20cf06580e809f6701688ab72e7756d Reviewed-on: https://chromium-review.googlesource.com/1336737 Commit-Ready: Zach Reizner <zachr@chromium.org> Tested-by: Zach Reizner <zachr@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
parent
2fb61f77fe
commit
674504a3de
2 changed files with 1 additions and 3 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -98,7 +98,6 @@ dependencies = [
|
|||
"plugin_proto 0.16.0",
|
||||
"protobuf 1.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"qcow 0.1.0",
|
||||
"qcow_utils 0.1.0",
|
||||
"rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"resources 0.1.0",
|
||||
"sys_util 0.1.0",
|
||||
|
|
|
@ -9,7 +9,7 @@ panic = 'abort'
|
|||
overflow-checks = true
|
||||
|
||||
[workspace]
|
||||
members = ["9s"]
|
||||
members = ["9s", "qcow_utils"]
|
||||
|
||||
[features]
|
||||
plugin = ["plugin_proto", "crosvm_plugin", "protobuf"]
|
||||
|
@ -39,7 +39,6 @@ qcow = { path = "qcow" }
|
|||
plugin_proto = { path = "plugin_proto", optional = true }
|
||||
crosvm_plugin = { path = "crosvm_plugin", optional = true }
|
||||
protobuf = { version = "=1.4.3", optional = true }
|
||||
qcow_utils = { path = "qcow_utils" }
|
||||
resources = { path = "resources" }
|
||||
p9 = { path = "p9" }
|
||||
rand = "=0.3.20"
|
||||
|
|
Loading…
Reference in a new issue