Getting the generated Makefile to support .proto files.

-) Compiling the proto plugin using the HOSTCC compiler.
-) Set up proper rules to invoke the plugin from protoc.
-) Few various renaming hacks to fully get out of [].
	Change on 2014/12/12 by nnoble <nnoble@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82000361

2 files changed, 5 insertions, 5 deletions

diff --git a/test/cpp/interop/empty.proto b/test/cpp/interop/empty.proto
index a698ab6f8a..c9920a22ee 100644
--- a/test/cpp/interop/empty.proto
+++ b/test/cpp/interop/empty.proto
@@ -1,19 +1,19 @@
 syntax = "proto2";
 
-package proto2;
+package grpc.testing;
 
 // An empty message that you can re-use to avoid defining duplicated empty
 // messages in your project. A typical example is to use it as argument or the
 // return value of a service API. For instance:
 //
 //   service Foo {
-//     rpc Bar (proto2.Empty) returns (proto2.Empty) { };
+//     rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
 //   };
 //
-// BEGIN GOOGLE-INTERNAL
+// MOE:begin_strip
 // The difference between this one and net/rpc/empty-message.proto is that
 // 1) The generated message here is in proto2 C++ API.
 // 2) The proto2.Empty has minimum dependencies
 //    (no message_set or net/rpc dependencies)
-// END GOOGLE-INTERNAL
+// MOE:end_strip
 message Empty {}
diff --git a/test/cpp/interop/test.proto b/test/cpp/interop/test.proto
index e9c1381b41..e358f3bea5 100644
--- a/test/cpp/interop/test.proto
+++ b/test/cpp/interop/test.proto
@@ -11,7 +11,7 @@ package grpc.testing;
 // performance with various types of payload.
 service TestService {
   // One empty request followed by one empty response.
-  rpc EmptyCall(proto2.Empty) returns (proto2.Empty);
+  rpc EmptyCall(grpc.testing.Empty) returns (grpc.testing.Empty);
 
   // One request followed by one response.
   // The server returns the client payload as-is.