Merge "Revert "Revert "Use the Finder's results for faster searching""" am: 30928b0c6f am: b339102f67 am: 401b75c299

am: e05961ed95

Change-Id: Ib5ce6e22df36e1590333eb179ed33b1c44d12c88
This commit is contained in:
Jeff Gaston 2017-08-18 19:47:43 +00:00 committed by android-build-merger
commit 9829f9a607
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