Merge "kati: Handle MAKECMDGOALS modifications"

diff --cc core/ninja.mk
index 0fc736a,4318463..d603996
--- 1/core/ninja.mk
--- 2/core/ninja.mk
+++ b/core/ninja.mk
@@@ -86,22 -86,16 +87,22 @@@ PHONY: showcommand
  showcommands: droid
  endif
  
 +ifdef KATI_REMOTE_NUM_JOBS_FLAG
 +KATI_MAKEPARALLEL := $(MAKEPARALLEL)
 +else
 +NINJA_MAKEPARALLEL := $(MAKEPARALLEL)
 +endif
 +
  ifeq (,$(filter generateonly,$(ORIGINAL_MAKECMDGOALS)))
- fastincremental droid $(ANDROID_TARGETS): ninja.intermediate
+ fastincremental droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): ninja.intermediate
        @#empty
  
  .INTERMEDIATE: ninja.intermediate
 -ninja.intermediate: $(KATI_OUTPUTS)
 +ninja.intermediate: $(KATI_OUTPUTS) $(MAKEPARALLEL)
        @echo Starting build with ninja
 -      $(hide) PATH=prebuilts/ninja/$(HOST_PREBUILT_TAG)/:$$PATH NINJA_STATUS="$(NINJA_STATUS)" $(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
- generateonly droid $(ANDROID_TARGETS): $(KATI_OUTPUTS)
+ generateonly droid $(ANDROID_TARGETS) $(EXTRA_TARGETS): $(KATI_OUTPUTS)
        @#empty
  endif