Improve error messages about paths am: ab1f518fb0 (1c00aec7) · Commits · e / os / android_build_soong

android/paths.go

+5 −5

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ func pathsForModuleSrcFromFullPath(ctx ModuleContext, paths []string, incDirs bo
		}
		path := filepath.Clean(p)
		if !strings.HasPrefix(path, prefix) {
		reportPathErrorf(ctx, "Path '%s' is not in module source directory '%s'", p, prefix)
		reportPathErrorf(ctx, "Path %q is not in module source directory %q", p, prefix)
		continue
		}

		@@ -505,7 +505,7 @@ func safePathForSource(ctx PathContext, pathComponents ...string) (SourcePath, e

		// absolute path already checked by validateSafePath
		if strings.HasPrefix(ret.String(), ctx.Config().buildDir) {
		return ret, fmt.Errorf("source path %s is in output", ret.String())
		return ret, fmt.Errorf("source path %q is in output", ret.String())
		}

		return ret, err
		@@ -521,7 +521,7 @@ func pathForSource(ctx PathContext, pathComponents ...string) (SourcePath, error

		// absolute path already checked by validatePath
		if strings.HasPrefix(ret.String(), ctx.Config().buildDir) {
		return ret, fmt.Errorf("source path %s is in output", ret.String())
		return ret, fmt.Errorf("source path %q is in output", ret.String())
		}

		return ret, nil
		@@ -575,7 +575,7 @@ func PathForSource(ctx PathContext, pathComponents ...string) SourcePath {
		} else if exists, _, err := ctx.Fs().Exists(path.String()); err != nil {
		reportPathErrorf(ctx, "%s: %s", path, err.Error())
		} else if !exists {
		reportPathErrorf(ctx, "source path %s does not exist", path)
		reportPathErrorf(ctx, "source path %q does not exist", path)
		}
		return path
		}
		@@ -740,7 +740,7 @@ func PathForModuleSrc(ctx ModuleContext, paths ...string) ModuleSrcPath {
		if exists, _, err := ctx.Fs().Exists(path.String()); err != nil {
		reportPathErrorf(ctx, "%s: %s", path, err.Error())
		} else if !exists {
		reportPathErrorf(ctx, "module source path %s does not exist", path)
		reportPathErrorf(ctx, "module source path %q does not exist", path)
		}

		return path