Merge "Split logtags implementations for cc and java"
diff --git a/ui/build/finder.go b/ui/build/finder.go
index 010b325..f35133b 100644
--- a/ui/build/finder.go
+++ b/ui/build/finder.go
@@ -80,17 +80,8 @@
ctx.Fatalf("Could not find modules: %v", err)
}
- isBlueprintFile := func(dir finder.DirEntries) (dirs []string, files []string) {
- files = []string{}
- for _, file := range dir.FileNames {
- if file == "Android.bp" || file == "Blueprints" {
- files = append(files, file)
- }
- }
-
- return dir.DirNames, files
- }
- androidBps := f.FindMatching(".", isBlueprintFile)
+ androidBps := f.FindNamedAt(".", "Android.bp")
+ androidBps = append(androidBps, f.FindNamedAt("build/blueprint", "Blueprints")...)
err = dumpListToFile(androidBps, filepath.Join(dumpDir, "Android.bp.list"))
if err != nil {
ctx.Fatalf("Could not find modules: %v", err)