Merge "Add TEST_MAPPING to finder's cache" am: 8763169bdb am: d3d2160907

am: 9ba1584a06

Change-Id: If3597b8d4173b9a7ea2dddefe712df3e0d3945b6
This commit is contained in:
Dan Shi 2017-11-29 20:03:04 +00:00 committed by android-build-merger
commit b2ea617505
1 changed files with 7 additions and 1 deletions

View File

@ -43,7 +43,7 @@ func NewSourceFinder(ctx Context, config Config) (f *finder.Finder) {
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 @@ func FindSources(ctx Context, config Config, f *finder.Finder) {
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 {