commit 285812156bed3c21058b955aae13f4723d65e698
author Jeff Gaston <jeffrygaston@google.com> Thu Aug 17 19:52:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 19:52:04 2017 +0000
tree b09adc01f8a4a68eccac3e4ff233c2ee1c67df42
parent da54a779282ad873e3d771aa91a3a6e7d7bb7b07
parent 1b1997c0286b99057e50c4f419a3f2b2330ba7f5

Merge "Use the Finder's results for faster searching" am: 2d71b221cb
am: 1b1997c028

Change-Id: I797bf0041f051b34b4160d2ed12a3ea878ce7aca

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 b1312ee..5d6ffc9 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -415,7 +415,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