From 53ed08aec00aa45f0326e3c7335638a85e985833 Mon Sep 17 00:00:00 2001 From: Wen-yi Chu Date: Fri, 22 Sep 2023 03:58:59 +0000 Subject: [PATCH] Revert "conditionally escape rule builder command" Revert submission 2629131-sandbox-rust-inputs Reason for revert: Fail on android build. Reverted changes: /q/submissionid:2629131-sandbox-rust-inputs Change-Id: I0d70fb9bbb9597d5fa68e764cdcf57f1a0333037 --- android/rule_builder.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/android/rule_builder.go b/android/rule_builder.go index 245b759ca..97582db2c 100644 --- a/android/rule_builder.go +++ b/android/rule_builder.go @@ -756,13 +756,9 @@ func (r *RuleBuilder) build(name string, desc string, ninjaEscapeCommandString b pool = localPool } - if ninjaEscapeCommandString { - commandString = proptools.NinjaEscape(commandString) - } - r.ctx.Build(r.pctx, BuildParams{ Rule: r.ctx.Rule(r.pctx, name, blueprint.RuleParams{ - Command: commandString, + Command: proptools.NinjaEscape(commandString), CommandDeps: proptools.NinjaEscapeList(tools.Strings()), Restat: r.restat, Rspfile: proptools.NinjaEscape(rspFile),