Merge "Revert "Use the Finder's results for faster searching"" am: 6df0626e58 am: 8467fba043 am: 12a4b403c2

am: 97079e0557

Change-Id: I19389b739e792372fa1d189d030c5a1d618b7b19
This commit is contained in:
Jeff Gaston 2017-08-17 20:36:11 +00:00 committed by android-build-merger
commit 46c9cfa1d1
2 changed files with 2 additions and 2 deletions

View File

@ -64,6 +64,6 @@ INTERNAL_CLEAN_BUILD_VERSION := 6
# ************************************************
subdir_cleanspecs := \
$(file <$(OUT_DIR)/.module_paths/CleanSpec.mk.list)
$(shell build/tools/findleaves.py $(FIND_LEAVES_EXCLUDES) . CleanSpec.mk)
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) $(file <$(OUT_DIR)/.module_paths/Android.mk.list)
subdir_makefiles := $(SOONG_ANDROID_MK) $(call first-makefiles-under,$(TOP))
subdir_makefiles_total := $(words $(subdir_makefiles))
.KATI_READONLY := subdir_makefiles_total