From 4e3ea546d7f0d95def0a5788a143e9d82cfcf515 Mon Sep 17 00:00:00 2001
From: Jeff Gaston <jeffrygaston@google.com>
Date: Fri, 4 Aug 2017 12:30:31 -0700
Subject: [PATCH] Use the Finder's results for faster searching

Bug: 64363847
Test: m -j

Change-Id: Ie0905d8c5c54cd4c0c3b3edda6c3f1c4135ed7ed
---
 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 4441e2ac3..af289540f 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 ef690e020..66b895166 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