commit 100edc4a4cb36f311b0eddf8b509d01053d88972
author Dan Willemsen <dwillemsen@google.com> Fri Feb 24 17:56:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 24 17:56:08 2017 +0000
tree 7277d3e97df20ff7a1adb30ea8e27e395310230a
parent e44f4e439d5524cc317c935879ef2f2376176da2
parent 353a659a31fb3d4d366172304cb1c48b457631d1

Merge "Add progress indicator to Android.mk includes"
am: 353a659a31

Change-Id: Iee11804f88b35c6b6c8da47792dc4568f9862307

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 750c329..556b41f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -3243,6 +3243,11 @@
 #$(warning 42 == $(call math_max,5,42))
 #$(warning 42 == $(call math_max,42,5))
 
+# $1 is the variable name to increment
+define inc_and_print
+$(strip $(eval $(1) := $($(1)) .)$(words $($(1))))
+endef
+
 ###########################################################
 ## Other includes
 ###########################################################

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index c131ed2..85f5d6c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -551,8 +551,10 @@
 #
 
 subdir_makefiles := $(SOONG_ANDROID_MK) $(call first-makefiles-under,$(TOP))
+subdir_makefiles_total := $(words $(subdir_makefiles))
+.KATI_READONLY := subdir_makefiles_total
 
-$(foreach mk,$(subdir_makefiles),$(info 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)))
 
 ifdef PDK_FUSION_PLATFORM_ZIP
 # Bring in the PDK platform.zip modules.