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

Commit 100edc4a authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Add progress indicator to Android.mk includes" 

am: 353a659a

Change-Id: Iee11804f88b35c6b6c8da47792dc4568f9862307
parents e44f4e43 353a659a

core/definitions.mk

+5 −0
Original line number Diff line number Diff line
@@ -3243,6 +3243,11 @@ endef 
#$(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

+3 −1
Original line number Diff line number Diff line
@@ -551,8 +551,10 @@ ifneq ($(dont_bother),true) 
#



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.