From 88dc18a31952edcf2dfea737e3989f2112e5155f Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 5 Oct 2015 15:12:08 -0700 Subject: [PATCH] Put NINJA_ARGS last Put NINJA_ARGS at the end of the command line so it can contain tools, which expect to be last. Change-Id: I5f47307d01aa52eb74a333b19ffe3a7cd8950b01 --- core/ninja.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ninja.mk b/core/ninja.mk index 6fc508d49..81298e52b 100644 --- a/core/ninja.mk +++ b/core/ninja.mk @@ -121,7 +121,7 @@ fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate .INTERMEDIATE: ninja.intermediate ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL) @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 generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS) @#empty