OSDN Git Service

Pass --ninja to makeparallel for ninja
authorColin Cross <ccross@android.com>
Fri, 18 Sep 2015 21:54:40 +0000 (14:54 -0700)
committerColin Cross <ccross@android.com>
Fri, 18 Sep 2015 22:02:40 +0000 (15:02 -0700)
When parallelism is being handled by ninja, pass --ninja to makeparallel
to have it translate -j with no number to default ninja parallelism, and
-k to -k0.

Bug: 24199503
Change-Id: Ic1be7572f93b33e4a71ed23e9e73dea1d4255703

core/ninja.mk

index d603996..56b4ac5 100644 (file)
@@ -90,7 +90,7 @@ endif
 ifdef KATI_REMOTE_NUM_JOBS_FLAG
 KATI_MAKEPARALLEL := $(MAKEPARALLEL)
 else
-NINJA_MAKEPARALLEL := $(MAKEPARALLEL)
+NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
 endif
 
 ifeq (,$(filter generateonly,$(ORIGINAL_MAKECMDGOALS)))