commit 4e3ea546d7f0d95def0a5788a143e9d82cfcf515
author Jeff Gaston <jeffrygaston@google.com> Fri Aug 04 12:30:31 2017 -0700
committer Jeff Gaston <jeffrygaston@google.com> Thu Aug 10 18:43:00 2017 -0700
tree b542912af66c339955d8f1bcf2d9691c1a5f55df
parent ea98ab2d3c1ebf87f3b035ae11229535ea006b2d

Use the Finder's results for faster searching

Bug: 64363847
Test: m -j

Change-Id: Ie0905d8c5c54cd4c0c3b3edda6c3f1c4135ed7ed

core/cleanspec.mk

diff --git a/core/cleanspec.mk b/core/cleanspec.mk
index 4441e2a..af28954 100644
--- a/core/cleanspec.mk
+++ b/core/cleanspec.mk
@@ -64,6 +64,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 :=

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index ef690e0..66b8951 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -403,7 +403,7 @@
 # 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