Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode" am: 86a1c9f916 am: 807f6927c7

am: b2d74278a7

Change-Id: I559840491703444c9b20e47397b57a8a1d78b48b
This commit is contained in:
Dan Willemsen 2017-02-07 02:28:35 +00:00 committed by android-build-merger
commit 9c2e892f4c
1 changed files with 20 additions and 0 deletions

View File

@ -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