Revert^2 "conditionally escape rule builder command"
53ed08aec0
Change-Id: Ic6e754bb270dbd3fa67ec31b5cbc1c5ef77d3238
This commit is contained in:
@@ -756,9 +756,13 @@ func (r *RuleBuilder) build(name string, desc string, ninjaEscapeCommandString b
|
|||||||
pool = localPool
|
pool = localPool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ninjaEscapeCommandString {
|
||||||
|
commandString = proptools.NinjaEscape(commandString)
|
||||||
|
}
|
||||||
|
|
||||||
r.ctx.Build(r.pctx, BuildParams{
|
r.ctx.Build(r.pctx, BuildParams{
|
||||||
Rule: r.ctx.Rule(r.pctx, name, blueprint.RuleParams{
|
Rule: r.ctx.Rule(r.pctx, name, blueprint.RuleParams{
|
||||||
Command: proptools.NinjaEscape(commandString),
|
Command: commandString,
|
||||||
CommandDeps: proptools.NinjaEscapeList(tools.Strings()),
|
CommandDeps: proptools.NinjaEscapeList(tools.Strings()),
|
||||||
Restat: r.restat,
|
Restat: r.restat,
|
||||||
Rspfile: proptools.NinjaEscape(rspFile),
|
Rspfile: proptools.NinjaEscape(rspFile),
|
||||||
|
Reference in New Issue
Block a user