Merge "Add TEST_MAPPING to finder's cache"
diff --git a/ui/build/finder.go b/ui/build/finder.go
index 05dec3a..010b325 100644
--- a/ui/build/finder.go
+++ b/ui/build/finder.go
@@ -43,7 +43,7 @@
RootDirs: []string{"."},
ExcludeDirs: []string{".git", ".repo"},
PruneFiles: []string{".out-dir", ".find-ignore"},
- IncludeFiles: []string{"Android.mk", "Android.bp", "Blueprints", "CleanSpec.mk"},
+ IncludeFiles: []string{"Android.mk", "Android.bp", "Blueprints", "CleanSpec.mk", "TEST_MAPPING"},
}
dumpDir := config.FileListDir()
f, err = finder.New(cacheParams, fs.OsFs, logger.New(ioutil.Discard),
@@ -74,6 +74,12 @@
ctx.Fatalf("Could not export module list: %v", err)
}
+ testMappings := f.FindNamedAt(".", "TEST_MAPPING")
+ err = dumpListToFile(testMappings, filepath.Join(dumpDir, "TEST_MAPPING.list"))
+ if err != nil {
+ ctx.Fatalf("Could not find modules: %v", err)
+ }
+
isBlueprintFile := func(dir finder.DirEntries) (dirs []string, files []string) {
files = []string{}
for _, file := range dir.FileNames {