From d05050ee9cc811466a6900e052a2506919d5963f Mon Sep 17 00:00:00 2001
From: Jeff Gaston <jeffrygaston@google.com>
Date: Fri, 18 Aug 2017 02:46:39 +0000
Subject: [PATCH] Revert "Revert "Use the Finder's results for faster
 searching""

This reverts commit 6f2aea5636e62197c7938073ee52dace620e03c5.

Reason for revert: Fix went in ( I70b08023b94b5789dc8394651bbac4c49c82787f ); trying again to use this

Change-Id: I0f58c21a7312dda01980d338401e756f610fe3b4
---
 core/cleanspec.mk | 2 +-
 core/main.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/cleanspec.mk b/core/cleanspec.mk
index 4441e2ac3f..af289540f3 100644
--- a/core/cleanspec.mk
+++ b/core/cleanspec.mk
@@ -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 :=
diff --git a/core/main.mk b/core/main.mk
index ef690e0209..66b895166c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -403,7 +403,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