tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.

Browse source 
This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
This commit is contained in:
Joe Onorato 2009-07-30 11:20:04 -07:00
parent 2a5d4d81b2
commit ead9646f1f
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/main.mk
View file

@ -327,8 +327,6 @@ endif
# Bring in all modules that need to be built.
ifneq ($(dont_bother),true)
subdir_makefiles :=
ifeq ($(HOST_OS),windows)
SDK_ONLY := true
endif
@ -426,15 +424,6 @@ endif # !BUILD_TINY_ANDROID
endif # !SDK_ONLY
# Can't use first-makefiles-under here because
# --mindepth=2 makes the prunes not work.
subdir_makefiles += \
$(shell build/tools/findleaves.sh --prune="./out" $(subdirs) Android.mk)
#
# Include all of the makefiles in the system
#
ifneq ($(ONE_SHOT_MAKEFILE),)
# We've probably been invoked by the "mm" shell function
# with a subdirectory's makefile.
@ -450,9 +439,21 @@ FULL_BUILD :=
# when using ONE_SHOT_MAKEFILE.
NOTICE-HOST-%: ;
NOTICE-TARGET-%: ;
else
else # ONE_SHOT_MAKEFILE
#
# Include all of the makefiles in the system
#
# Can't use first-makefiles-under here because
# --mindepth=2 makes the prunes not work.
subdir_makefiles := \
$(shell build/tools/findleaves.sh --prune="./out" $(subdirs) Android.mk)
include $(subdir_makefiles)
endif
endif # ONE_SHOT_MAKEFILE
# -------------------------------------------------------------------
# All module makefiles have been included at this point.
# -------------------------------------------------------------------