From 0533e4df402b0c13748ab55921b923731becb98d Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 15 Aug 2016 13:38:21 -0700
Subject: [PATCH] Simplify Soong bootstrapping

Now we only run the "main" stage from Soong once, and only when combined
with the Kati ninja file. So we can now depend on pools or rules defined
by Kati in Soong.

Change-Id: I7a8fd699ddc0d41bbcbbf3c6f2edb9e26ccfc4c9
---
 core/soong.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/soong.mk b/core/soong.mk
index 4f1500571..80dcefd33 100644
--- a/core/soong.mk
+++ b/core/soong.mk
@@ -90,4 +90,4 @@ $(SOONG_IN_MAKE):
 # prebuilts.
 .PHONY: run_soong
 run_soong: $(SOONG_BOOTSTRAP) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE
-	$(hide) $(SOONG) $(SOONG_BUILD_NINJA) $(NINJA_EXTRA_ARGS)
+	$(hide) SKIP_NINJA=true $(SOONG)
-- 
2.11.0