From ce3fbd3fd8f4c038463eb62fd223ec34e62d54d9 Mon Sep 17 00:00:00 2001
From: Xudong Ma <simonma@google.com>
Date: Wed, 29 Apr 2015 11:42:21 -0700
Subject: [PATCH] Fix breakage due to gRPC java package change: nano ->
 protobuf.nano

---
 java/android/app/build.gradle                          |  2 +-
 .../java/io/grpc/helloworldexample/GreeterGrpc.java    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/android/app/build.gradle b/java/android/app/build.gradle
index 6940ad0a2a8..aedf4fe92a0 100644
--- a/java/android/app/build.gradle
+++ b/java/android/app/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     // You need to build the https://github.com/grpc/grpc-java
     // to obtain these libraries below.
     compile 'io.grpc:grpc-core:0.1.0-SNAPSHOT'
-    compile 'io.grpc:grpc-nano:0.1.0-SNAPSHOT'
+    compile 'io.grpc:grpc-protobuf-nano:0.1.0-SNAPSHOT'
     compile 'io.grpc:grpc-okhttp:0.1.0-SNAPSHOT'
     compile 'io.grpc:grpc-stub:0.1.0-SNAPSHOT'
 }
diff --git a/java/android/app/src/main/java/io/grpc/helloworldexample/GreeterGrpc.java b/java/android/app/src/main/java/io/grpc/helloworldexample/GreeterGrpc.java
index 595c1402349..817c9fde8fc 100644
--- a/java/android/app/src/main/java/io/grpc/helloworldexample/GreeterGrpc.java
+++ b/java/android/app/src/main/java/io/grpc/helloworldexample/GreeterGrpc.java
@@ -15,15 +15,15 @@ public class GreeterGrpc {
             Helloworld.HelloReply> METHOD_SAY_HELLO =
             io.grpc.stub.Method.create(
                     io.grpc.MethodType.UNARY, "SayHello",
-                    io.grpc.nano.NanoUtils.<Helloworld.HelloRequest>marshaller(
-                            new io.grpc.nano.Parser<Helloworld.HelloRequest>() {
+                    io.grpc.protobuf.nano.NanoUtils.<Helloworld.HelloRequest>marshaller(
+                            new io.grpc.protobuf.nano.Parser<Helloworld.HelloRequest>() {
                                 @Override
                                 public Helloworld.HelloRequest parse(com.google.protobuf.nano.CodedInputByteBufferNano input) throws IOException {
                                     return Helloworld.HelloRequest.parseFrom(input);
                                 }
                             }),
-                    io.grpc.nano.NanoUtils.<Helloworld.HelloReply>marshaller(
-                            new io.grpc.nano.Parser<Helloworld.HelloReply>() {
+                    io.grpc.protobuf.nano.NanoUtils.<Helloworld.HelloReply>marshaller(
+                            new io.grpc.protobuf.nano.Parser<Helloworld.HelloReply>() {
                                 @Override
                                 public Helloworld.HelloReply parse(com.google.protobuf.nano.CodedInputByteBufferNano input) throws IOException {
                                     return Helloworld.HelloReply.parseFrom(input);
@@ -176,4 +176,4 @@ public class GreeterGrpc {
                                     }
                                 }))).build();
     }
-}
\ No newline at end of file
+}