tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Don't pass empty arguments to ninja" am: f8acdc50fa

Browse source 
am: d4aba70550

Change-Id: I97206e4ec7baad1679f3a5b325a920ab7f8863c0
This commit is contained in:
Colin Cross 2017-01-19 06:51:21 +00:00 committed by android-build-merger
commit ac15f41714
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/makeparallel/makeparallel.cpp
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]);