Move .proto files up for reuse

6 files changed, 8 insertions, 7 deletions

diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc
index 33053edc97..7f5757d2ba 100644
--- a/test/cpp/interop/interop_client.cc
+++ b/test/cpp/interop/interop_client.cc
@@ -44,8 +44,8 @@
 #include <grpc++/status.h>
 #include <grpc++/stream.h>
 #include "test/proto/test.grpc.pb.h"
-#include "test/cpp/interop/empty.grpc.pb.h"
-#include "test/cpp/interop/messages.grpc.pb.h"
+#include "test/proto/empty.grpc.pb.h"
+#include "test/proto/messages.grpc.pb.h"
 
 namespace grpc {
 namespace testing {
diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h
index b0ab320f8d..3161f7f875 100644
--- a/test/cpp/interop/interop_client.h
+++ b/test/cpp/interop/interop_client.h
@@ -38,7 +38,7 @@
 #include <grpc/grpc.h>
 #include <grpc++/channel_interface.h>
 #include <grpc++/status.h>
-#include "test/cpp/interop/messages.grpc.pb.h"
+#include "test/proto/messages.grpc.pb.h"
 
 namespace grpc {
 namespace testing {
diff --git a/test/cpp/interop/server.cc b/test/cpp/interop/server.cc
index d48e9dcfa5..7888102837 100644
--- a/test/cpp/interop/server.cc
+++ b/test/cpp/interop/server.cc
@@ -49,8 +49,8 @@
 #include <grpc++/status.h>
 #include <grpc++/stream.h>
 #include "test/proto/test.grpc.pb.h"
-#include "test/cpp/interop/empty.grpc.pb.h"
-#include "test/cpp/interop/messages.grpc.pb.h"
+#include "test/proto/empty.grpc.pb.h"
+#include "test/proto/messages.grpc.pb.h"
 #include "test/cpp/interop/server_helper.h"
 #include "test/cpp/util/test_config.h"
 
diff --git a/test/cpp/interop/empty.proto b/test/proto/empty.proto
index 4295a0a960..4295a0a960 100644
--- a/test/cpp/interop/empty.proto
+++ b/test/proto/empty.proto
diff --git a/test/cpp/interop/messages.proto b/test/proto/messages.proto
index 65a8140465..65a8140465 100644
--- a/test/cpp/interop/messages.proto
+++ b/test/proto/messages.proto
diff --git a/test/proto/test.proto b/test/proto/test.proto
index b55780e5cd..b9483d8437 100644
--- a/test/proto/test.proto
+++ b/test/proto/test.proto
@@ -30,10 +30,11 @@
 
 // An integration test service that covers all the method signature permutations
 // of unary/streaming requests/responses.
+
 syntax = "proto2";
 
-import "test/cpp/interop/empty.proto";
-import "test/cpp/interop/messages.proto";
+import "test/proto/empty.proto";
+import "test/proto/messages.proto";
 
 package grpc.testing;