commit c4e0c0a0b82d61c848ef10c59a9e6cd5e13de1d1
author Jeff Gaston <jeffrygaston@google.com> Thu Aug 17 20:02:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 20:02:07 2017 +0000
tree 0f04acf0f3f20a9c38422526702072978c06c495
parent fe986bb5ea818e1eddd94a307ac2744a05534db9
parent a92b602b4b2c34036adbec581fce686a4539011b

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

Change-Id: Ie6b619808760fedc1174385c091a149d3aaa1107

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 06c03e5..34dc7a5 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -420,7 +420,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