StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow blueprint change to return GlobResult from Glob"

Browse Source
This commit is contained in:
Colin Cross
2021-04-13 17:01:39 +00:00
committed by Gerrit Code Review
parent c8ae73e678 82ea3fb273
commit 66d154e436
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/paths.go
View File

@@ -1101,11 +1101,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 {