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

Merge "Only create a command line replacer once" am: 2c3122e90a

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

Change-Id: I6df41d70091b4f6ed54ec4e329268845e5e882df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liz Kammer
2023-02-14 19:52:41 +00:00
committed by Automerger Merge Worker
parent 43002dd9e9 2c3122e90a
commit 7ea0da5d3f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bazel/aquery.go
View File

@@ -671,17 +671,18 @@ func expandTemplateContent(actionEntry action) string {
return replacer.Replace(actionEntry.TemplateContent) return replacer.Replace(actionEntry.TemplateContent)
} }
// \->\\, $->\$, `->\`, "->\", \n->\\n, '->'"'"'
var commandLineArgumentReplacer = strings.NewReplacer(
`\`, `\\`,
`$`, `\$`,
"`", "\\`",
`"`, `\"`,
"\n", "\\n",
`'`, `'"'"'`,
)
func escapeCommandlineArgument(str string) string { func escapeCommandlineArgument(str string) string {
// \->\\, $->\$, `->\`, "->\", \n->\\n, '->'"'"' return commandLineArgumentReplacer.Replace(str)
replacer := strings.NewReplacer(
`\`, `\\`,
`$`, `\$`,
"`", "\\`",
`"`, `\"`,
"\n", "\\n",
`'`, `'"'"'`,
)
return replacer.Replace(str)
} }
func (a action) isSymlinkAction() bool { func (a action) isSymlinkAction() bool {