StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "kati: Handle MAKECMDGOALS modifications"

Browse Source
This commit is contained in:
Dan Willemsen
2015-09-15 00:28:42 +00:00
committed by Gerrit Code Review
parent 4ce3cea770 cb1bd116ed
commit b384eb84c3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/ninja.mk
View File

@@ -55,6 +55,7 @@ PARSE_TIME_MAKE_GOALS := \
-include vendor/google/build/ninja_config.mk -include vendor/google/build/ninja_config.mk
ANDROID_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(ORIGINAL_MAKECMDGOALS)) ANDROID_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(ORIGINAL_MAKECMDGOALS))
EXTRA_TARGETS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(NINJA_GOALS),$(filter-out $(ORIGINAL_MAKECMDGOALS),$(MAKECMDGOALS)))
KATI_TARGETS := $(if $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)),$(ANDROID_TARGETS),) KATI_TARGETS := $(if $(filter $(PARSE_TIME_MAKE_GOALS),$(ANDROID_TARGETS)),$(ANDROID_TARGETS),)
define replace_space_and_slash define replace_space_and_slash
@@ -93,7 +94,7 @@ NINJA_MAKEPARALLEL := $(MAKEPARALLEL)
endif endif
ifeq (,$(filter generateonly,$(ORIGINAL_MAKECMDGOALS))) ifeq (,$(filter generateonly,$(ORIGINAL_MAKECMDGOALS)))
fastincremental droid $(ANDROID_TARGETS): ninja.intermediate fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate
@#empty @#empty
.INTERMEDIATE: ninja.intermediate .INTERMEDIATE: ninja.intermediate
@@ -101,7 +102,7 @@ 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) $(ANDROID_TARGETS) +$(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(NINJA_MAKEPARALLEL) $(KATI_NINJA_SH) -C $(TOP) $(NINJA_ARGS) $(ANDROID_TARGETS)
else else
generateonly droid $(ANDROID_TARGETS): $(KATI_OUTPUTS) generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)
@#empty @#empty
endif endif