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

Merge changes I2ba90314,I5f47307d am: fc8b331858 

am: 8b63d67e1b

* commit '8b63d67e1ba42d090e19cae32e802117b9cac852':
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last
This commit is contained in:
Colin Cross 2015-10-21 00:26:52 +00:00 committed by android-build-merger
parent 92a73a0f6c 8b63d67e1b
commit 5538dc8bfe
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ninja.mk
View File

@ -121,7 +121,7 @@ fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate
.INTERMEDIATE: ninja.intermediate .INTERMEDIATE: ninja.intermediate
ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL) ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL)
@echo Starting build with ninja @echo Starting build with ninja
+$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) -C $(TOP) $(NINJA_ARGS) $(filter-out dist,$(ANDROID_TARGETS)) +$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) $(filter-out dist,$(ANDROID_TARGETS)) -C $(TOP) $(NINJA_ARGS)
else else
generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS) generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)
@#empty @#empty

2
tools/makeparallel/Makefile
View File

@ -90,3 +90,5 @@ makeparallel_test: $(MAKEPARALLEL)
@EXPECTED="-j1" $(MAKEPARALLEL_TEST) A=-j1234 @EXPECTED="-j1" $(MAKEPARALLEL_TEST) A=-j1234
@EXPECTED="-j1" $(MAKEPARALLEL_TEST) A\ -j1234=-j1234 @EXPECTED="-j1" $(MAKEPARALLEL_TEST) A\ -j1234=-j1234
@EXPECTED="-j1234" $(MAKEPARALLEL_TEST) A\ -j1234=-j1234 -j1234 @EXPECTED="-j1234" $(MAKEPARALLEL_TEST) A\ -j1234=-j1234 -j1234
@EXPECTED="-j1234 args" ARGS="args" $(MAKEPARALLEL_TEST) -j1234

2
tools/makeparallel/Makefile.test
View File

@ -3,7 +3,7 @@ MAKEPARALLEL ?= ./makeparallel
.PHONY: test .PHONY: test
test: test:
@+echo MAKEFLAGS=$${MAKEFLAGS}; \ @+echo MAKEFLAGS=$${MAKEFLAGS}; \
result=$$($(MAKEPARALLEL) echo); \ result=$$($(MAKEPARALLEL) echo $(ARGS)); \
echo result: $${result}; \ echo result: $${result}; \
if [ "$${result}" = "$(EXPECTED)" ]; then \ if [ "$${result}" = "$(EXPECTED)" ]; then \
echo SUCCESS && echo; \ echo SUCCESS && echo; \

8
tools/makeparallel/makeparallel.cpp
View File

@ -298,8 +298,12 @@ int main(int argc, char* argv[]) {
argc--; argc--;
} }
if (argc < 2) {
error(EXIT_FAILURE, 0, "expected command to run");
}
const char* path = argv[1]; const char* path = argv[1];
std::vector<char*> args(&argv[1], &argv[argc]); std::vector<char*> args({argv[1]});
std::vector<std::string> makeflags = ReadMakeflags(); std::vector<std::string> makeflags = ReadMakeflags();
if (ParseMakeflags(makeflags, &in_fd, &out_fd, &parallel, &keep_going)) { if (ParseMakeflags(makeflags, &in_fd, &out_fd, &parallel, &keep_going)) {
@ -328,6 +332,8 @@ int main(int argc, char* argv[]) {
args.push_back(strdup(jarg.c_str())); args.push_back(strdup(jarg.c_str()));
} }
args.insert(args.end(), &argv[2], &argv[argc]);
args.push_back(nullptr); args.push_back(nullptr);
pid_t pid = fork(); pid_t pid = fork();