From faee6ce7faa982529751a06cde31f8d51837abad Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Fri, 13 Aug 2021 10:43:07 -0700 Subject: [PATCH] Update setup_cros_cargo.sh to fix all paths for chromeos cargo builds This allows ChromeOS developers to use cargo to build against the crates provided by the ChromeOS source tree, instead of using the bundled submodules. BUG=b:196585250 TEST=./setup_cros_cargo.sh && cargo build Change-Id: I02d38784f7a97657c37c267818499efed4ddab47 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3092414 Auto-Submit: Dennis Kempin Tested-by: kokoro Reviewed-by: Keiichi Watanabe Commit-Queue: Dennis Kempin --- setup_cros_cargo.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/setup_cros_cargo.sh b/setup_cros_cargo.sh index aa5a65a456..ed6e526352 100755 --- a/setup_cros_cargo.sh +++ b/setup_cros_cargo.sh @@ -8,7 +8,16 @@ # # TODO(b/194323235): Add documentation for ChromeOS developer workflows. -sed -i 's|path = "libcras_stub"|path = "../../third_party/adhd/cras/client/libcras"|g' \ - Cargo.toml +declare -A replacements=( + ["libcras_stub"]="../../third_party/adhd/cras/client/libcras" + ["third_party/minijail"]="../../aosp/external/minijail" + ["third_party/vmm_vhost"]="../../third_party/rust-vmm/vhost" +) + +for crate in "${!replacements[@]}"; do + echo "Replacing '${crate}' with '${replacements[$crate]}'" + sed -i "s|path = \"${crate}|path = \"${replacements[$crate]}|g" \ + Cargo.toml +done echo "Modified Cargo.toml with new paths. Please do not commit those."