Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ea79982 authored by Liz Kammer's avatar Liz Kammer
Browse files

Update error messages for failed globs. 

Currently error messages appear like:
&fs.PathError{Op:"open", Path:"..." Err:0x18}
which make them difficult to parse.

Test: CI
Change-Id: I18da18abc43230d0ea37d166179d07e585077f51
parent cc1a2062

cc/library.go

+6 −4
Original line number Diff line number Diff line
@@ -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")

rust/library.go

+3 −2
Original line number Diff line number Diff line
@@ -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

		}