Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 518373f8 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Add more status output 

soong_ui now parses the output from kati into "actions" to feed into the
unified status system. It also looks for errors and marks the enclosing
section as failed.

This adds a few more states so that error messages can be more
appropriately attributed - so that all errors at the end of the buid
aren't attributed to the last makefile read.

Test: m
Test: add some errors
Change-Id: I3abdb004c82e2b99822906910cd66123c11a5099
parent d4b9e01f

core/main.mk

+13 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ $(sort $(MAKECMDGOALS)) : run_soong_ui 


else # KATI



$(info [1/1] initializing build system ...)



# 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.
@@ -405,6 +407,8 @@ ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),) 
ENFORCE_RRO_SOURCES :=

endif



subdir_makefiles_inc := .



ifneq ($(ONE_SHOT_MAKEFILE),)

# We've probably been invoked by the "mm" shell function

# 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_total := $(words $(subdir_makefiles))

subdir_makefiles_total := $(words int $(subdir_makefiles) post finish)

.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)))
@@ -465,6 +469,12 @@ endif # dont_bother 


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.

# -------------------------------------------------------------------
@@ -1405,4 +1415,6 @@ tidy_only: 
ndk: $(SOONG_OUT_DIR)/ndk.timestamp

.PHONY: ndk



$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] writing build rules ...)



endif # KATI