Merge "Update wording on depfile property error" into main (e25374a9) · Commits · e / os / android_build_soong

genrule/genrule.go

+4 −6

Original line number	Diff line number	Diff line
		@@ -581,17 +581,15 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) {

		func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		// Allowlist genrule to use depfile until we have a solution to remove it.
		// TODO(b/235582219): Remove allowlist for genrule
		// TODO(b/307824623): Remove depfile property
		if Bool(g.properties.Depfile) {
		sandboxingAllowlistSets := getSandboxingAllowlistSets(ctx)
		// TODO(b/283852474): Checking the GenruleSandboxing flag is temporary in
		// order to pass the presubmit before internal master is updated.
		if ctx.DeviceConfig().GenruleSandboxing() && !sandboxingAllowlistSets.depfileAllowSet[g.Name()] {
		ctx.PropertyErrorf(
		"depfile",
		"Deprecated to ensure the module type is convertible to Bazel. "+
		"Try specifying the dependencies explicitly so that there is no need to use depfile. "+
		"If not possible, the escape hatch is to add the module to allowlists.go to bypass the error.")
		"Deprecated because with genrule sandboxing, dependencies must be known before the action is run "+
		"in order to add them to the sandbox. "+
		"Please specify the dependencies explicitly so that there is no need to use depfile.")
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -708,7 +708,7 @@ func TestGenruleAllowlistingDepfile(t *testing.T) {
		depfile: true,
		cmd: "cat $(in) > $(out) && cat $(depfile)",
		`,
		err: "depfile: Deprecated to ensure the module type is convertible to Bazel",
		err: "depfile: Deprecated because with genrule sandboxing, dependencies must be known before the action is run in order to add them to the sandbox",
		},
		{
		name: `no error when module is allowlisted`,