diff --git a/core/definitions.mk b/core/definitions.mk
index b4e4b50..ea84156 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -128,7 +128,8 @@
 # $(1): directory to search under
 # Ignores $(1)/Android.mk
 define first-makefiles-under
-$(shell build/tools/findleaves.sh --mindepth=2 $(1) Android.mk)
+$(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git \
+        --mindepth=2 $(1) Android.mk)
 endef
 
 ###########################################################
diff --git a/core/main.mk b/core/main.mk
index 482fefd..64c6976 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -459,7 +459,7 @@
 # Can't use first-makefiles-under here because
 # --mindepth=2 makes the prunes not work.
 subdir_makefiles := \
-	$(shell build/tools/findleaves.sh --prune="./out" $(subdirs) Android.mk)
+	$(shell build/tools/findleaves.py --prune=out --prune=.repo --prune=.git $(subdirs) Android.mk)
 
 include $(subdir_makefiles)
 endif # ONE_SHOT_MAKEFILE