summaryrefslogtreecommitdiff
path: root/tools/makeparallel/makeparallel.cpp
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2017-01-18 21:12:28 -0800
committer Colin Cross <ccross@android.com> 2017-01-18 21:12:28 -0800
commit524c868107e561aa47ac209f5a81b4313ab77e66 (patch)
tree63b009d08165c02ddc3ff62f8acf210dd274deae /tools/makeparallel/makeparallel.cpp
parentba55c623cbc8e4a1ea9b191b223e0d9c4de4dfea (diff)
Don't pass empty arguments to ninja
Passing an empty argument in argv to ninja results in an error: ninja: error: empty path Don't add jarg to the argument list if it is empty. Bug: 34392351 Test: m -j Change-Id: I39c8998c79b09835650628e1413ae7625cdbc555
Diffstat (limited to 'tools/makeparallel/makeparallel.cpp')
-rw-r--r--tools/makeparallel/makeparallel.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/makeparallel/makeparallel.cpp b/tools/makeparallel/makeparallel.cpp
index b90668186e..0e1e45c153 100644
--- a/tools/makeparallel/makeparallel.cpp
+++ b/tools/makeparallel/makeparallel.cpp
@@ -338,13 +338,17 @@ int main(int argc, char* argv[]) {
// 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]);