Merge "Use the Finder's results for faster searching"

am: 2d71b221cb

Change-Id: I4e78ca9eabeb8259be4a5996d53737719485d9df
This commit is contained in:
Jeff Gaston 2017-08-17 19:48:33 +00:00 committed by android-build-merger
commit 1b1997c028
2 changed files with 2 additions and 2 deletions

View file

@ -64,6 +64,6 @@ INTERNAL_CLEAN_BUILD_VERSION := 6
# ************************************************
subdir_cleanspecs := \
$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) . CleanSpec.mk)
$(file <$(OUT_DIR)/.module_paths/CleanSpec.mk.list)
include $(subdir_cleanspecs)
subdir_cleanspecs :=

View file

@ -415,7 +415,7 @@ ifneq ($(dont_bother),true)
# Include all of the makefiles in the system
#
subdir_makefiles := $(SOONG_ANDROID_MK) $(call first-makefiles-under,$(TOP))
subdir_makefiles := $(SOONG_ANDROID_MK) $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
subdir_makefiles_total := $(words $(subdir_makefiles))
.KATI_READONLY := subdir_makefiles_total