From af6c071a5f5fbb5d8af82884889ca17b59ad41f7 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 18 Sep 2015 14:54:40 -0700
Subject: [PATCH] Pass --ninja to makeparallel for ninja

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/ninja.mk b/core/ninja.mk
index d60399681..56b4ac565 100644
--- a/core/ninja.mk
+++ b/core/ninja.mk
@@ -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)))
-- 
2.11.0