Fix rebase failures

Author: jmuk

lib/api_repo.js

@@ -439,11 +439,11 @@ ApiRepo.prototype.buildCommonProtoPkgs =
  * @param {function(?Error, string[])} done - The callback.
  */
 ApiRepo.prototype._collectProtoDeps = function _collectProtoDeps(
-    includePath, env, protoFile, done) {
+    includePath, protoFile, done) {
   var deps = tmp.fileSync();
   var desc = tmp.fileSync();
-  var args = this.protoCompilerArgs.concat(
-      ['--dependency_out=' + deps.name, '-o', desc.name]);
+  var args = this.protoCompilerArgs ? this.protoCompilerArgs.split(' ') : [];
+  args.push('--dependency_out=' + deps.name, '-o', desc.name);
   if (includePath) {
     includePath.forEach(function(ipath) {
       args.push('-I', ipath);
@@ -452,7 +452,7 @@ ApiRepo.prototype._collectProtoDeps = function _collectProtoDeps(
   args.push(protoFile);
   // Invokes protoc with --dependency_out to generate the dependency
   // proto files.
-  execFile(this.protoCompiler, args, {env: env}, function(err) {
+  execFile(this.protoCompiler, args, {env: this.env}, function(err) {
     if (err) {
       done(err);
     }
@@ -580,7 +580,7 @@ ApiRepo.prototype._buildProtos =
               var outDir = path.join(langTopDir, 'proto');
               async.map(
                   fullPathProtos,
-                  this._collectProtoDeps.bind(null, includePath, this.opts.env),
+                  this._collectProtoDeps.bind(this, includePath),
                   function(err, fileLists) {
                     if (err) {
                       findOutputs(err);

test/api_repo.js

@@ -106,7 +106,8 @@ describe('ApiRepo', function() {
           env: {PATH: fakes.path},
           includePath: [path.join(__dirname, 'fixtures', 'include')],
           languages: ['nodejs'],
-          templateRoot: path.join(__dirname, '..', 'templates')
+          templateRoot: path.join(__dirname, '..', 'templates'),
+          protoCompiler: 'echo'
         });
         getsGoodZipFrom(repo.zipUrl);
       });

test/fixtures/fake_protoc

@@ -20,9 +20,6 @@
 
 main() {
     echo $@  # first echo, the protoc tests need that.
-    if [ -z `echo "$@" | grep -o 'grpc_out'` ]; then
-      return
-    fi
 
     local proto_path=${!#}
     local out_dir=$(echo "$@" | sed 's/.*--grpc_out=\([^ ]*\).*/\1/')