From 3eb10cf6fa577f0233982ab5bdd394cf8131bb77 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 6 Sep 2016 13:19:14 -0700
Subject: [PATCH] Add USE_SOONG_UI to trigger soong_ui in Make mode

Test: USE_SOONG_UI=true m -j
Change-Id: Ic7a0b4e0881757b0324722d7d316fb8d13dabd9b
---
 core/main.mk | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/core/main.mk b/core/main.mk
index 017b818ae..6ec6e669e 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -9,6 +9,25 @@ else
 SHELL := /bin/bash
 endif
 
+ifndef KATI
+USE_SOONG_UI ?= false
+endif
+ifeq ($(USE_SOONG_UI),true)
+
+host_prebuilts := linux-x86
+ifeq ($(shell uname),Darwin)
+host_prebuilts := darwin-x86
+endif
+
+.PHONY: run_soong_ui
+run_soong_ui:
+	+@prebuilts/build-tools/$(host_prebuilts)/bin/makeparallel --ninja build/soong/soong_ui.bash --make-mode $(MAKECMDGOALS)
+
+.PHONY: $(MAKECMDGOALS)
+$(MAKECMDGOALS) : run_soong_ui
+
+else # USE_SOONG_UI
+
 # Absolute path of the present working direcotry.
 # This overrides the shell variable $PWD, which does not necessarily points to
 # the top of the source tree, for example when "make -C" is used in m/mm/mmm.
@@ -1122,3 +1141,4 @@ ndk: $(SOONG_OUT_DIR)/ndk.timestamp
 all_link_types:
 
 endif # KATI
+endif # USE_SOONG_UI