Replace *Escape with *EscapeList
Follow the change to blueprint to make *Escape take and return a string
and add *EscapeList that take and return slices of strings. Fix up
a few places that were unnecessarily converting a string to a slice
and back to a string.
Test: m nothing
Change-Id: I3fa87de175522205f36544ef76aa2f04aef1b936
diff --git a/android/module.go b/android/module.go
index 2fa7d31..516fa78 100644
--- a/android/module.go
+++ b/android/module.go
@@ -931,12 +931,12 @@
bparams.Implicits = append(bparams.Implicits, params.Implicit.String())
}
- bparams.Outputs = proptools.NinjaEscape(bparams.Outputs)
- bparams.ImplicitOutputs = proptools.NinjaEscape(bparams.ImplicitOutputs)
- bparams.Inputs = proptools.NinjaEscape(bparams.Inputs)
- bparams.Implicits = proptools.NinjaEscape(bparams.Implicits)
- bparams.OrderOnly = proptools.NinjaEscape(bparams.OrderOnly)
- bparams.Depfile = proptools.NinjaEscape([]string{bparams.Depfile})[0]
+ bparams.Outputs = proptools.NinjaEscapeList(bparams.Outputs)
+ bparams.ImplicitOutputs = proptools.NinjaEscapeList(bparams.ImplicitOutputs)
+ bparams.Inputs = proptools.NinjaEscapeList(bparams.Inputs)
+ bparams.Implicits = proptools.NinjaEscapeList(bparams.Implicits)
+ bparams.OrderOnly = proptools.NinjaEscapeList(bparams.OrderOnly)
+ bparams.Depfile = proptools.NinjaEscapeList([]string{bparams.Depfile})[0]
return bparams
}
diff --git a/android/rule_builder.go b/android/rule_builder.go
index ff43e22..178a481 100644
--- a/android/rule_builder.go
+++ b/android/rule_builder.go
@@ -240,7 +240,7 @@
if len(r.Commands()) > 0 {
ctx.Build(pctx, BuildParams{
Rule: ctx.Rule(pctx, name, blueprint.RuleParams{
- Command: strings.Join(proptools.NinjaEscape(r.Commands()), " && "),
+ Command: strings.Join(proptools.NinjaEscapeList(r.Commands()), " && "),
CommandDeps: r.Tools().Strings(),
}),
Implicits: r.Inputs(),