Merge "Follow blueprint change to return GlobResult from Glob" (66d154e4) · Commits · e / os / android_build_soong

android/paths.go

+4 −3

Original line number	Diff line number	Diff line
		@@ -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 {

+5 −5

Original line number	Diff line number	Diff line
		@@ -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)