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

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

Browse Source 
am: d2445ea0b2

Change-Id: Ib60190f62fc78e261b6d02287bf8f68891bd7d12
This commit is contained in:
Dan Willemsen
2017-02-24 18:01:52 +00:00
committed by android-build-merger
parent ee4ab96b00 d2445ea0b2
commit 433e7e4d45
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/definitions.mk
View File

@@ -3250,6 +3250,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
###########################################################

4
core/main.mk
View File

@@ -557,8 +557,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.