commit f7f57b79c9fdfe435d336e60ff529601266dd62c
author Xudong Ma <simonma@google.com> Thu Sep 24 11:16:07 2015 -0700
committer Xudong Ma <simonma@google.com> Mon Sep 28 09:49:02 2015 -0700
tree 069019573e28bf39099eb7386d41dfdfbe157129
parent f15f672b7907f00c75705e9e4f4c7f4ce5b5b4a0

Put nano generated code into nano package, unless option javanano_use_deprecated_package is set.

Also fix the behaior while java_package is set to empty.

compiler/build.gradle

diff --git a/compiler/build.gradle b/compiler/build.gradle
index 3af17a6..4625292 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -208,7 +208,7 @@
 
 test.dependsOn('testGolden', 'testNanoGolden')
 
-def configureTestTask(Task task, String suffix) {
+def configureTestTask(Task task, String suffix, String extraPackage) {
   task.dependsOn "generateTest${suffix}Proto"
   if (osdetector.os != 'windows') {
     task.executable "diff"
@@ -217,11 +217,11 @@
   }
   // File isn't found on Windows if last slash is forward-slash
   def slash = System.getProperty("file.separator")
-  task.args "$buildDir/generated/source/proto/test${suffix}/grpc/io/grpc/testing/integration${slash}TestServiceGrpc.java",
+  task.args "$buildDir/generated/source/proto/test${suffix}/grpc/io/grpc/testing/integration${extraPackage}${slash}TestServiceGrpc.java",
        "$projectDir/src/test/golden/TestService${suffix}.java.txt"
 }
 
 task testGolden(type: Exec)
 task testNanoGolden(type: Exec)
-configureTestTask(testGolden, '')
-configureTestTask(testNanoGolden, 'Nano')
+configureTestTask(testGolden, '', '')
+configureTestTask(testNanoGolden, 'Nano', '/nano')