diff options
| author | 2022-02-07 18:26:49 +0000 | |
|---|---|---|
| committer | 2022-02-07 18:26:49 +0000 | |
| commit | 1f1ad1f67d485bf5ef3e302141cd9025ca22c97c (patch) | |
| tree | 7eb8e19e45cd9de31f0fe9b6b07f18d318aa8c0d | |
| parent | c19e95946a1fd407bf3d715c63d6739f963aa586 (diff) | |
| parent | f41f38cce2c2fa887989c3188fbff8599d66e616 (diff) | |
Merge "Update error messages for failed globs." am: c01e074fef am: f0fcf896f9 am: 61f5ba2ec4 am: f41f38cce2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1973544
Change-Id: I0ae667a5173bf61444a8e672b6c70b458556d5ce
| -rw-r--r-- | cc/library.go | 10 | ||||
| -rw-r--r-- | rust/library.go | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/cc/library.go b/cc/library.go index cefbf6c44..de5d46fed 100644 --- a/cc/library.go +++ b/cc/library.go @@ -757,9 +757,10 @@ func GlobHeadersForSnapshot(ctx android.ModuleContext, paths android.Paths) andr if dir == "external/eigen" { // Only these two directories contains exported headers. 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 { - ctx.ModuleErrorf("glob failed: %#v", err) + ctx.ModuleErrorf("glob of %q failed: %s", globDir, err) return nil } for _, header := range glob { @@ -775,9 +776,10 @@ func GlobHeadersForSnapshot(ctx android.ModuleContext, paths android.Paths) andr } continue } - glob, err := ctx.GlobWithDeps(dir+"/**/*", nil) + globDir := dir + "/**/*" + glob, err := ctx.GlobWithDeps(globDir, nil) if err != nil { - ctx.ModuleErrorf("glob failed: %#v", err) + ctx.ModuleErrorf("glob of %q failed: %s", globDir, err) return nil } isLibcxx := strings.HasPrefix(dir, "external/libcxx/include") diff --git a/rust/library.go b/rust/library.go index baac3f0bc..62eaefd68 100644 --- a/rust/library.go +++ b/rust/library.go @@ -773,9 +773,10 @@ func (l *libraryDecorator) collectHeadersForSnapshot(ctx android.ModuleContext, // Glob together the headers from the modules include_dirs property for _, path := range android.CopyOfPaths(l.includeDirs) { dir := path.String() - glob, err := ctx.GlobWithDeps(dir+"/**/*", nil) + globDir := dir + "/**/*" + glob, err := ctx.GlobWithDeps(globDir, nil) if err != nil { - ctx.ModuleErrorf("glob failed: %#v", err) + ctx.ModuleErrorf("glob of %q failed: %s", globDir, err) return } |