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

Commit bebf5260 authored Feb 23, 2022 by Anton Hansson

Clarify genrule error message

Point the user toward checking their $(location) label is mentioned
elsewhere in the build rule (as opposed to a typo of the module name,
for example).

Test: genrule_test.go
Change-Id: Icc19740938e2b56eef24540534f9cc5bfa9420b8

parent 2ace628b

genrule/genrule.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -496,7 +496,7 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		}
		return paths[0], nil
		} else {
		return reportError("unknown location label %q", label)
		return reportError("unknown location label %q is not in srcs, out, tools or tool_files.", label)
		}
		} else if strings.HasPrefix(name, "locations ") {
		label := strings.TrimSpace(strings.TrimPrefix(name, "locations "))
		@@ -507,7 +507,7 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		}
		return strings.Join(paths, " "), nil
		} else {
		return reportError("unknown locations label %q", label)
		return reportError("unknown locations label %q is not in srcs, out, tools or tool_files.", label)
		}
		} else {
		return reportError("unknown variable '$(%s)'", name)

genrule/genrule_test.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ func TestGenruleCmd(t *testing.T) {
		out: ["out"],
		cmd: "echo foo > $(location missing)",
		`,
		err: `unknown location label "missing"`,
		err: `unknown location label "missing" is not in srcs, out, tools or tool_files.`,
		},
		{
		name: "error locations",
		@@ -349,7 +349,7 @@ func TestGenruleCmd(t *testing.T) {
		out: ["out"],
		cmd: "echo foo > $(locations missing)",
		`,
		err: `unknown locations label "missing"`,
		err: `unknown locations label "missing" is not in srcs, out, tools or tool_files`,
		},
		{
		name: "error location no files",