From 6676bdadb218a1c0174e059e12729edae9cac1ad Mon Sep 17 00:00:00 2001
From: Chirantan Ekbote <chirantan@chromium.org>
Date: Tue, 30 Mar 2021 19:08:52 +0900
Subject: [PATCH] Fixup Cargo.toml for cros_async and io_uring

Add magic comments so that we can have separate ebuilds for the io_uring
and cros_async crates.

BUG=none
TEST=`FEATURES=test emerge-$BOARD cros_async`

Change-Id: I8e4befc90d44b4b021864f4358c8f9b3ec5a87d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2794162
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 cros_async/Cargo.toml | 15 ++++++++-------
 io_uring/Cargo.toml   | 10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cros_async/Cargo.toml b/cros_async/Cargo.toml
index 579f1716a3..848e461bb9 100644
--- a/cros_async/Cargo.toml
+++ b/cros_async/Cargo.toml
@@ -8,15 +8,15 @@ edition = "2018"
 async-trait = "0.1.36"
 async-task = "4"
 intrusive-collections = "0.9"
-io_uring = { path = "../io_uring" }
+io_uring = { path = "../io_uring" } # provided by ebuild
 libc = "*"
 paste = "1.0"
 pin-utils = "0.1.0-alpha.4"
 slab = "0.4"
-sync = { path = "../sync" }
-sys_util = { path = "../sys_util" }
-data_model = { path = "../data_model" }
-syscall_defines = { path = "../syscall_defines" }
+sync = { path = "../sync" } # provided by ebuild
+sys_util = { path = "../sys_util" } # provided by ebuild
+data_model = { path = "../data_model" } # provided by ebuild
+syscall_defines = { path = "../syscall_defines" } # provided by ebuild
 thiserror = "1.0.20"
 
 [dependencies.futures]
@@ -28,5 +28,6 @@ features = ["alloc"]
 futures = { version = "*", features = ["executor"] }
 futures-executor = { version = "0.3", features = ["thread-pool"] }
 futures-util = "0.3"
-tempfile = { path = "../tempfile" }
-vm_memory = { path = "../vm_memory" }
+tempfile = { path = "../tempfile" } # provided by ebuild
+
+[workspace]
\ No newline at end of file
diff --git a/io_uring/Cargo.toml b/io_uring/Cargo.toml
index cbe5aa1e69..b018e7a4c1 100644
--- a/io_uring/Cargo.toml
+++ b/io_uring/Cargo.toml
@@ -5,13 +5,13 @@ authors = ["The Chromium OS Authors"]
 edition = "2018"
 
 [dependencies]
-data_model = { path = "../data_model" }
+data_model = { path = "../data_model" } # provided by ebuild
 libc = "*"
-syscall_defines = { path = "../syscall_defines" }
-sync = { path = "../sync" }
-sys_util = { path = "../sys_util" }
+syscall_defines = { path = "../syscall_defines" } # provided by ebuild
+sync = { path = "../sync" } # provided by ebuild
+sys_util = { path = "../sys_util" } # provided by ebuild
 
 [dev-dependencies]
-tempfile = { path = "../tempfile" }
+tempfile = { path = "../tempfile" } # provided by ebuild
 
 [workspace]