commit d46f6c81de667835939041eb52758bfb6645a936
author Sam Delmerico <delmerico@google.com> Mon Sep 25 12:13:17 2023 +0000
committer Sam Delmerico <delmerico@google.com> Mon Sep 25 12:13:17 2023 +0000
tree 40e08969fd4d6ef475a823c7146b4dc1cc95223c
parent 285b66a117ffe4edb44ffd7e1a0b10f93de0c277

Revert^2 "conditionally escape rule builder command"

53ed08aec00aa45f0326e3c7335638a85e985833

Change-Id: Ic6e754bb270dbd3fa67ec31b5cbc1c5ef77d3238

android/rule_builder.go

diff --git a/android/rule_builder.go b/android/rule_builder.go
index 97582db..245b759 100644
--- a/android/rule_builder.go
+++ b/android/rule_builder.go
@@ -756,9 +756,13 @@
 		pool = localPool
 	}
 
+	if ninjaEscapeCommandString {
+		commandString = proptools.NinjaEscape(commandString)
+	}
+
 	r.ctx.Build(r.pctx, BuildParams{
 		Rule: r.ctx.Rule(r.pctx, name, blueprint.RuleParams{
-			Command:        proptools.NinjaEscape(commandString),
+			Command:        commandString,
 			CommandDeps:    proptools.NinjaEscapeList(tools.Strings()),
 			Restat:         r.restat,
 			Rspfile:        proptools.NinjaEscape(rspFile),