openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: ac15f41714

Change-Id: I7e3ccee98fa04fbb8887d5dacd8f13e8341d6c05
This commit is contained in:
Colin Cross 2017-01-19 06:53:52 +00:00 committed by android-build-merger
parent 054fe8dc8a ac15f41714
commit 239c78a5b3
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]);