Merge "Use the Finder's results for faster searching" am: 2d71b221cb am: 1b1997c028 am: 285812156b

am: b0839fc05b

Change-Id: Ib9341113134249f2978b2d59b75719e6f58bde02
This commit is contained in:
Jeff Gaston 2017-08-17 19:59:06 +00:00 committed by android-build-merger
commit a92b602b4b
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

@ -420,7 +420,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