From 52af470d5b2b26e1e138fb39e11758f626fcf0c3 Mon Sep 17 00:00:00 2001
From: Nobutaka Takushima <n.takushima@gmail.com>
Date: Mon, 20 Apr 2015 12:13:19 +0900
Subject: [PATCH] fix android app build broken by
 https://github.com/grpc/grpc-java/commit/3666de4427460a307bfb86a7f93b3a04cb28f8c4

In grpc-java, io.grpc.nano was renamed to io.grpc.protobuf.nano.
Therefore, android app fails to build with the latest version of grpc-java.
---
 java/android/app/build.gradle                             | 2 +-
 .../main/java/io/grpc/helloworldexample/GreeterGrpc.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 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..2a22b004d17 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);