StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add more status output"

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-12 23:14:44 +00:00
committed by Gerrit Code Review
parent dc39f73d5b 518373f8af
commit 5787711e75
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/main.mk
View File

@@ -26,6 +26,8 @@ $(sort $(MAKECMDGOALS)) : run_soong_ui
else # KATI else # KATI
$(info [1/1] initializing build system ...)
# Absolute path of the present working direcotry. # Absolute path of the present working direcotry.
# This overrides the shell variable $PWD, which does not necessarily points to # 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. # the top of the source tree, for example when "make -C" is used in m/mm/mmm.
@@ -405,6 +407,8 @@ ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
ENFORCE_RRO_SOURCES := ENFORCE_RRO_SOURCES :=
endif endif
subdir_makefiles_inc := .
ifneq ($(ONE_SHOT_MAKEFILE),) ifneq ($(ONE_SHOT_MAKEFILE),)
# We've probably been invoked by the "mm" shell function # We've probably been invoked by the "mm" shell function
# with a subdirectory's makefile. # with a subdirectory's makefile.
@@ -449,7 +453,7 @@ ifneq ($(dont_bother),true)
# #
subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list) subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
subdir_makefiles_total := $(words $(subdir_makefiles)) subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)
.KATI_READONLY := subdir_makefiles_total .KATI_READONLY := subdir_makefiles_total
$(foreach mk,$(subdir_makefiles),$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] including $(mk) ...)$(eval include $(mk))) $(foreach mk,$(subdir_makefiles),$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] including $(mk) ...)$(eval include $(mk)))
@@ -465,6 +469,12 @@ endif # dont_bother
endif # ONE_SHOT_MAKEFILE endif # ONE_SHOT_MAKEFILE
ifndef subdir_makefiles_total
subdir_makefiles_total := $(words init post finish)
endif
$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] finishing build rules ...)
# ------------------------------------------------------------------- # -------------------------------------------------------------------
# All module makefiles have been included at this point. # All module makefiles have been included at this point.
# ------------------------------------------------------------------- # -------------------------------------------------------------------
@@ -1405,4 +1415,6 @@ tidy_only:
ndk: $(SOONG_OUT_DIR)/ndk.timestamp ndk: $(SOONG_OUT_DIR)/ndk.timestamp
.PHONY: ndk .PHONY: ndk
$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] writing build rules ...)
endif # KATI endif # KATI