Follow blueprint change to return GlobResult from Glob

Follow I2159cc9d85f388073198eac7456e5bf43e813096 that makes Glob
return a GlobResult.

Bug: 159845846
Test: glob_test.go
Change-Id: Ia771bdbdf1eb668623c4b3f00bf65e0e1e3a55c0
This commit is contained in:
Colin Cross
2021-04-05 17:48:26 -07:00
parent c02504edd6
commit 82ea3fb273
2 changed files with 9 additions and 8 deletions

View File

@@ -1095,11 +1095,12 @@ func existsWithDependencies(ctx PathContext, path SourcePath) (exists bool, err
// a single file.
files, err = gctx.GlobWithDeps(path.String(), nil)
} else {
var deps []string
var result pathtools.GlobResult
// We cannot add build statements in this context, so we fall back to
// AddNinjaFileDeps
files, deps, err = ctx.Config().fs.Glob(path.String(), nil, pathtools.FollowSymlinks)
ctx.AddNinjaFileDeps(deps...)
result, err = ctx.Config().fs.Glob(path.String(), nil, pathtools.FollowSymlinks)
ctx.AddNinjaFileDeps(result.Deps...)
files = result.Matches
}
if err != nil {