Merge "Don't pass empty arguments to ninja" (d4aba705) · Commits · e / os / android_build

tools/makeparallel/makeparallel.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -338,14 +338,18 @@ 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 {
		if (jarg != "") {
		args.push_back(strdup(jarg.c_str()));
		}
		}
		if (keep_going) {
		args.push_back(strdup("-k0"));
		}
		} else {
		if (jarg != "") {
		args.push_back(strdup(jarg.c_str()));
		}
		}

		args.insert(args.end(), &argv[2], &argv[argc]);