From aa8be0515bbc8e22e7baa6f6e9baa4405be32cd9 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Wed, 14 Oct 2020 16:22:37 -0400 Subject: [PATCH] Change bazel_module property to be of struct type instead of string Test: Manual verification, and update to genrule_test.go Change-Id: Ic507a35438be5261342a958f3a462a73739e2482 --- genrule/genrule.go | 10 ++++++++-- genrule/genrule_test.go | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/genrule/genrule.go b/genrule/genrule.go index 178587ad5..99d62076b 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -81,6 +81,12 @@ type hostToolDependencyTag struct { label string } +// TODO(cparsons): Move to a common location when there is more than just +// genrule with a bazel_module property. +type bazelModuleProperties struct { + Label string +} + type generatorProperties struct { // The command to run on one or more input files. Cmd supports substitution of a few variables // @@ -115,7 +121,7 @@ type generatorProperties struct { Exclude_srcs []string `android:"path,arch_variant"` // in bazel-enabled mode, the bazel label to evaluate instead of this module - Bazel_module string + Bazel_module bazelModuleProperties } type Module struct { android.ModuleBase @@ -472,7 +478,7 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { g.outputFiles = outputFiles.Paths() - bazelModuleLabel := g.properties.Bazel_module + bazelModuleLabel := g.properties.Bazel_module.Label bazelActionsUsed := false if ctx.Config().BazelContext.BazelEnabled() && len(bazelModuleLabel) > 0 { bazelActionsUsed = g.generateBazelBuildActions(ctx, bazelModuleLabel) diff --git a/genrule/genrule_test.go b/genrule/genrule_test.go index c692019c3..fdbb9d962 100644 --- a/genrule/genrule_test.go +++ b/genrule/genrule_test.go @@ -726,7 +726,7 @@ func TestGenruleWithBazel(t *testing.T) { genrule { name: "foo", out: ["one.txt", "two.txt"], - bazel_module: "//foo/bar:bar", + bazel_module: { label: "//foo/bar:bar" }, } `