commit 0533e4df402b0c13748ab55921b923731becb98d
author Dan Willemsen <dwillemsen@google.com> Mon Aug 15 13:38:21 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Aug 31 00:58:12 2016 -0700
tree 85c38d8ccd1251627f5f8aa09ade9b0ae702168e
parent 049dd578728c887e82ec83819b0a5bf5ea3577c9

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

diff --git a/core/soong.mk b/core/soong.mk
index 4f15005..80dcefd 100644
--- a/core/soong.mk
+++ b/core/soong.mk
@@ -90,4 +90,4 @@
 # 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)