Turn GlobFiles into a Glob for files, use it am: 540a78c1ce am: f49ff89266

am: a7070c158c

Change-Id: I06f6cc4481f826de7f7923630c2de344c84603a6
This commit is contained in:
Dan Willemsen
2018-03-02 00:29:39 +00:00
committed by android-build-merger
5 changed files with 13 additions and 33 deletions

View File

@@ -342,17 +342,7 @@ func AndroidAppFactory() android.Module {
}
func resourceGlob(ctx android.ModuleContext, dir android.Path) android.Paths {
var ret android.Paths
files := ctx.Glob(filepath.Join(dir.String(), "**/*"), aaptIgnoreFilenames)
for _, f := range files {
if isDir, err := ctx.Fs().IsDir(f.String()); err != nil {
ctx.ModuleErrorf("error in IsDir(%s): %s", f.String(), err.Error())
return nil
} else if !isDir {
ret = append(ret, f)
}
}
return ret
return ctx.GlobFiles(filepath.Join(dir.String(), "**/*"), aaptIgnoreFilenames)
}
type overlayGlobResult struct {
@@ -440,10 +430,7 @@ func (overlaySingleton) GenerateBuildActions(ctx android.SingletonContext) {
}
var paths android.Paths
for _, f := range files {
if isDir, err := ctx.Fs().IsDir(f); err != nil {
ctx.Errorf("error in IsDir(%s): %s", f, err.Error())
return
} else if !isDir {
if !strings.HasSuffix(f, "/") {
paths = append(paths, android.PathForSource(ctx, f))
}
}