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

Merge "Update error messages for failed globs."

Browse Source
This commit is contained in:
Treehugger Robot
2022-02-07 17:24:23 +00:00
committed by Gerrit Code Review
parent b039496446 0ea7998208
commit c01e074fef
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/library.go
View File

@@ -757,9 +757,10 @@ func GlobHeadersForSnapshot(ctx android.ModuleContext, paths android.Paths) andr
if dir == "external/eigen" { if dir == "external/eigen" {
// Only these two directories contains exported headers. // Only these two directories contains exported headers.
for _, subdir := range []string{"Eigen", "unsupported/Eigen"} { for _, subdir := range []string{"Eigen", "unsupported/Eigen"} {
glob, err := ctx.GlobWithDeps("external/eigen/"+subdir+"/**/*", nil) globDir := "external/eigen/" + subdir + "/**/*"
glob, err := ctx.GlobWithDeps(globDir, nil)
if err != nil { if err != nil {
ctx.ModuleErrorf("glob failed: %#v", err) ctx.ModuleErrorf("glob of %q failed: %s", globDir, err)
return nil return nil
} }
for _, header := range glob { for _, header := range glob {
@@ -775,9 +776,10 @@ func GlobHeadersForSnapshot(ctx android.ModuleContext, paths android.Paths) andr
} }
continue continue
} }
glob, err := ctx.GlobWithDeps(dir+"/**/*", nil) globDir := dir + "/**/*"
glob, err := ctx.GlobWithDeps(globDir, nil)
if err != nil { if err != nil {
ctx.ModuleErrorf("glob failed: %#v", err) ctx.ModuleErrorf("glob of %q failed: %s", globDir, err)
return nil return nil
} }
isLibcxx := strings.HasPrefix(dir, "external/libcxx/include") isLibcxx := strings.HasPrefix(dir, "external/libcxx/include")

5
rust/library.go
View File

@@ -773,9 +773,10 @@ func (l *libraryDecorator) collectHeadersForSnapshot(ctx android.ModuleContext,
// Glob together the headers from the modules include_dirs property // Glob together the headers from the modules include_dirs property
for _, path := range android.CopyOfPaths(l.includeDirs) { for _, path := range android.CopyOfPaths(l.includeDirs) {
dir := path.String() dir := path.String()
glob, err := ctx.GlobWithDeps(dir+"/**/*", nil) globDir := dir + "/**/*"
glob, err := ctx.GlobWithDeps(globDir, nil)
if err != nil { if err != nil {
ctx.ModuleErrorf("glob failed: %#v", err) ctx.ModuleErrorf("glob of %q failed: %s", globDir, err)
return return
} }