openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Add progress indicator to Android.mk includes" 

am: 353a659a31

Change-Id: Iee11804f88b35c6b6c8da47792dc4568f9862307
This commit is contained in:
Dan Willemsen 2017-02-24 17:56:08 +00:00 committed by android-build-merger
parent e44f4e439d 353a659a31
commit 100edc4a4c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/definitions.mk
View File

@ -3243,6 +3243,11 @@ endef
#$(warning 42 == $(call math_max,5,42)) #$(warning 42 == $(call math_max,5,42))
#$(warning 42 == $(call math_max,42,5)) #$(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 ## Other includes
########################################################### ###########################################################

4
core/main.mk
View File

@ -551,8 +551,10 @@ ifneq ($(dont_bother),true)
# #
subdir_makefiles := $(SOONG_ANDROID_MK) $(call first-makefiles-under,$(TOP)) 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 ifdef PDK_FUSION_PLATFORM_ZIP
# Bring in the PDK platform.zip modules. # Bring in the PDK platform.zip modules.