Make oak_abi a standalone crate (#1034)

project-oak · May 27, 2020 · d2bfcc3 · d2bfcc3
1 parent 333681d
commit d2bfcc3
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,6 @@ members = [
   "experimental/split_grpc/client",
   "experimental/split_grpc/proxy",
   "experimental/split_grpc/server",
-  "oak/server/rust/oak_abi",
   "oak/server/rust/oak_glue",
   "oak/server/rust/oak_loader",
   "oak/server/rust/oak_runtime",
@@ -37,7 +36,7 @@ members = [
 [patch.crates-io]
 # Oak.
 oak = { path = "sdk/rust/oak" }
-oak_abi = { path = "oak/server/rust/oak_abi" }
+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" }

diff --git a/examples/aggregator/module/rust/Cargo.toml b/examples/aggregator/module/rust/Cargo.toml
@@ -18,7 +18,6 @@ prost = "*"
 
 [dev-dependencies]
 assert_matches = "*"
-oak_abi = "=0.1.0"
 oak_runtime = "=0.1.0"
 oak_tests = "=0.1.0"
 maplit = "*"

diff --git a/oak/server/rust/oak_abi/Cargo.toml → oak_abi/Cargo.toml b/oak/server/rust/oak_abi/Cargo.toml → oak_abi/Cargo.toml
diff --git a/oak/server/rust/oak_abi/build.rs → oak_abi/build.rs b/oak/server/rust/oak_abi/build.rs → oak_abi/build.rs
@@ -17,14 +17,14 @@
 fn main() {
     oak_utils::compile_protos(
         &[
-            "../../../../oak/proto/application.proto",
-            "../../../../oak/proto/grpc_encap.proto",
-            "../../../../oak/proto/label.proto",
-            "../../../../oak/proto/log.proto",
-            "../../../../oak/proto/oak_abi.proto",
-            "../../../../third_party/google/rpc/code.proto",
-            "../../../../third_party/google/rpc/status.proto",
+            "../oak/proto/application.proto",
+            "../oak/proto/grpc_encap.proto",
+            "../oak/proto/label.proto",
+            "../oak/proto/log.proto",
+            "../oak/proto/oak_abi.proto",
+            "../third_party/google/rpc/code.proto",
+            "../third_party/google/rpc/status.proto",
         ],
-        &["../../../.."],
+        &[".."],
     );
 }
diff --git a/oak/server/rust/oak_abi/src/grpc/mod.rs → oak_abi/src/grpc/mod.rs b/oak/server/rust/oak_abi/src/grpc/mod.rs → oak_abi/src/grpc/mod.rs
diff --git a/oak/server/rust/oak_abi/src/label/mod.rs → oak_abi/src/label/mod.rs b/oak/server/rust/oak_abi/src/label/mod.rs → oak_abi/src/label/mod.rs
diff --git a/oak/server/rust/oak_abi/src/label/tests.rs → oak_abi/src/label/tests.rs b/oak/server/rust/oak_abi/src/label/tests.rs → oak_abi/src/label/tests.rs
diff --git a/oak/server/rust/oak_abi/src/lib.rs → oak_abi/src/lib.rs b/oak/server/rust/oak_abi/src/lib.rs → oak_abi/src/lib.rs
diff --git a/oak/server/rust/oak_abi/src/proto/mod.rs → oak_abi/src/proto/mod.rs b/oak/server/rust/oak_abi/src/proto/mod.rs → oak_abi/src/proto/mod.rs