commit 366902561d0186696f1e81b1b55412b3afbd7d4d
author Colin Cross <ccross@android.com> Thu Jan 19 06:56:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 19 06:56:22 2017 +0000
tree f185e3296273888f66959d97e462703160f3e9be
parent 2b22ec459dafe98e3cef54f38dcc69a98b53da37
parent 239c78a5b349f2adab2f816a012cb84a035205df

Merge "Don't pass empty arguments to ninja" am: f8acdc50fa am: d4aba70550 am: ac15f41714
am: 239c78a5b3

Change-Id: Icbd643898cc9babb09090525aa7f0961cf9a04c9

tools/makeparallel/makeparallel.cpp

diff --git a/tools/makeparallel/makeparallel.cpp b/tools/makeparallel/makeparallel.cpp
index b906681..0e1e45c 100644
--- a/tools/makeparallel/makeparallel.cpp
+++ b/tools/makeparallel/makeparallel.cpp
@@ -338,13 +338,17 @@
       // ninja is parallel by default, pass -j1 to disable parallelism if make wasn't parallel
       args.push_back(strdup("-j1"));
     } else {
-      args.push_back(strdup(jarg.c_str()));
+      if (jarg != "") {
+        args.push_back(strdup(jarg.c_str()));
+      }
     }
     if (keep_going) {
       args.push_back(strdup("-k0"));
     }
   } else {
-    args.push_back(strdup(jarg.c_str()));
+    if (jarg != "") {
+      args.push_back(strdup(jarg.c_str()));
+    }
   }
 
   args.insert(args.end(), &argv[2], &argv[argc]);