commit d05050ee9cc811466a6900e052a2506919d5963f
author Jeff Gaston <jeffrygaston@google.com> Fri Aug 18 02:46:39 2017 +0000
committer Jeff Gaston <jeffrygaston@google.com> Fri Aug 18 02:46:39 2017 +0000
tree b542912af66c339955d8f1bcf2d9691c1a5f55df
parent 6f2aea5636e62197c7938073ee52dace620e03c5

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/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