Merge "Don't pass empty arguments to ninja"

am: f8acdc50fa

Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195
This commit is contained in:
Colin Cross 2017-01-19 06:48:21 +00:00 committed by android-build-merger
commit d4aba70550
1 changed files with 6 additions and 2 deletions

View File

@ -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]);