diff --git a/proto/umbra/base.proto b/proto/umbra/base.proto index 554d636..3c7e98d 100644 --- a/proto/umbra/base.proto +++ b/proto/umbra/base.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package umbra.base; -import "proto/umbra/encryption.proto"; -import "proto/umbra/invite.proto"; +import "encryption.proto"; +import "invite.proto"; /////////////////////////////////////////////////////////////////////////////// diff --git a/proto/umbra/conversations/private_v1.proto b/proto/umbra/conversations/private_v1.proto index 87e315f..43a6a73 100644 --- a/proto/umbra/conversations/private_v1.proto +++ b/proto/umbra/conversations/private_v1.proto @@ -2,7 +2,8 @@ syntax = "proto3"; package umbra.convos.private_v1; -import "proto/umbra/common_frames.proto"; +import "common_frames.proto"; + diff --git a/rust/umbra-types/build.rs b/rust/umbra-types/build.rs index 0e4a5e5..2e98da9 100644 --- a/rust/umbra-types/build.rs +++ b/rust/umbra-types/build.rs @@ -12,6 +12,8 @@ fn get_proto_dir() -> PathBuf { let mut proto_root_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()); proto_root_dir.pop(); proto_root_dir.pop(); + proto_root_dir.push("proto"); + proto_root_dir.push("umbra"); println!("proto_dir: {:?}", proto_root_dir); proto_root_dir @@ -26,11 +28,11 @@ fn main() { config .compile_protos( &[ - "proto/umbra/base.proto", - "proto/umbra/common_frames.proto", - "proto/umbra/conversations/private_v1.proto", - "proto/umbra/encryption.proto", - "proto/umbra/invite.proto", + "base.proto", + "common_frames.proto", + "conversations/private_v1.proto", + "encryption.proto", + "invite.proto", ], // set proto_path &[get_proto_dir().to_str().unwrap()],