StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "reland-rust-sbox-1" into main am: ec59517f6a am: fcf6a3c1d4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2761808

Change-Id: I7ffa6615a9fa4a272fd3571c6a95ce9efe7d9661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sam Delmerico
2023-09-27 10:19:44 +00:00
committed by Automerger Merge Worker
parent e9d00acc22 fcf6a3c1d4
commit 0d1b6ee209
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/rule_builder.go
View File

@@ -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),