openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Follow blueprint change to return GlobResult from Glob" am: 66d154e436 am: 02fd994651 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1668888

Change-Id: I779c0fc70c89a35cf1d640d64bac0334b528216d
This commit is contained in:
Colin Cross 2021-04-13 18:24:45 +00:00 committed by Automerger Merge Worker
parent 11a16dbf08 02fd994651
commit 6b31915982
2 changed files with 9 additions and 8 deletions
Show Stats 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 {

10
zip/zip.go
View File

@ -292,11 +292,11 @@ func zipTo(args ZipArgs, w io.Writer) error {
continue
}
globbed, _, err := z.fs.Glob(s, nil, followSymlinks)
result, err := z.fs.Glob(s, nil, followSymlinks)
if err != nil {
return err
}
if len(globbed) == 0 {
if len(result.Matches) == 0 {
err := &os.PathError{
Op: "lstat",
Path: s,
@ -308,7 +308,7 @@ func zipTo(args ZipArgs, w io.Writer) error {
return err
}
}
srcs = append(srcs, globbed...)
srcs = append(srcs, result.Matches...)
}
if fa.GlobDir != "" {
if exists, isDir, err := z.fs.Exists(fa.GlobDir); err != nil {
@ -336,11 +336,11 @@ func zipTo(args ZipArgs, w io.Writer) error {
return err
}
}
globbed, _, err := z.fs.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, followSymlinks)
result, err := z.fs.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, followSymlinks)
if err != nil {
return err
}
srcs = append(srcs, globbed...)
srcs = append(srcs, result.Matches...)
}
for _, src := range srcs {
err := fillPathPairs(fa, src, &pathMappings, args.NonDeflatedFiles, noCompression)