genrule: Make cmd configurable

Bug: 325067608
Bug: 325444956
Test: m
Test: m [custom genrule with select]
Change-Id: I3a2307a8d0f65ee419b935a30742f96e5733a81f
This commit is contained in:
Aleks Todorov 2024-06-03 15:23:56 +01:00
parent d5e16ac52b
commit 1eb06c4a67

View file

@ -126,7 +126,7 @@ type generatorProperties struct {
// $(out): a single output file. // $(out): a single output file.
// $(genDir): the sandbox directory for this tool; contains $(out). // $(genDir): the sandbox directory for this tool; contains $(out).
// $$: a literal $ // $$: a literal $
Cmd *string Cmd proptools.Configurable[string] `android:"replace_instead_of_append"`
// name of the modules (if any) that produces the host executable. Leave empty for // name of the modules (if any) that produces the host executable. Leave empty for
// prebuilts or scripts that do not need a module to build them. // prebuilts or scripts that do not need a module to build them.
@ -403,7 +403,7 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) {
var outputFiles android.WritablePaths var outputFiles android.WritablePaths
var zipArgs strings.Builder var zipArgs strings.Builder
cmd := String(g.properties.Cmd) cmd := g.properties.Cmd.GetOrDefault(ctx, "")
if g.CmdModifier != nil { if g.CmdModifier != nil {
cmd = g.CmdModifier(ctx, cmd) cmd = g.CmdModifier(ctx, cmd)
} }