Exclude oak_abi and oak_utils from the workspace (#1039)

* Moves `oak_utils` to the root folder * Excludes `oak_abi` and `oak_utils` from the workspace
project-oak · May 28, 2020 · 0b133c0 · 0b133c0
1 parent 8188216
commit 0b133c0
Show file tree

Hide file tree

Showing 6 changed files with 732 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,8 +25,8 @@ members = [
   "runner",
   "sdk/rust/oak",
   "sdk/rust/oak_tests",
-  "sdk/rust/oak_utils",
 ]
+exclude = ["oak_abi", "oak_utils"]
 
 # Patch dependencies on oak crates so that they refer to the versions within this same repository.
 #
@@ -40,7 +40,7 @@ oak_abi = { path = "oak_abi" }
 oak_loader = { path = "oak/server/rust/oak_loader" }
 oak_runtime = { path = "oak/server/rust/oak_runtime" }
 oak_tests = { path = "sdk/rust/oak_tests" }
-oak_utils = { path = "sdk/rust/oak_utils" }
+oak_utils = { path = "oak_utils" }
 runner = { path = "runner" }
 # Examples.
 abitest_common = { path = "examples/abitest/abitest_common" }

diff --git a/oak_abi/Cargo.lock b/oak_abi/Cargo.lock
diff --git a/oak_abi/Cargo.toml b/oak_abi/Cargo.toml
@@ -11,5 +11,5 @@ prost = "*"
 prost-types = "*"
 
 [build-dependencies]
-oak_utils = "*"
+oak_utils = { path = "../oak_utils" }
 prost-build = "*"