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

Merge "Simplify commandString" into main am: 8aca5be771

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

Change-Id: I644183caedfbe7ec4d765c712483d0166b8d3ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-24 20:34:07 +00:00
committed by Automerger Merge Worker
parent 4da84d851a 8aca5be771
commit 63f68771c7
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
bazel/aquery.go
View File

@@ -443,26 +443,21 @@ func (a *aqueryArtifactHandler) depsetContentHashes(inputDepsetIds []uint32) ([]
// escapes the args received from aquery and creates a command string
func commandString(actionEntry *analysis_v2_proto.Action) string {
switch actionEntry.Mnemonic {
case "GoCompilePkg", "GoStdlib":
argsEscaped := []string{}
for _, arg := range actionEntry.Arguments {
if arg == "" {
// If this is an empty string, add ''
// And not
// 1. (literal empty)
// 2. `''\'''\'''` (escaped version of '')
//
// If we had used (1), then this would appear as a whitespace when we strings.Join
argsEscaped = append(argsEscaped, "''")
} else {
argsEscaped = append(argsEscaped, proptools.ShellEscapeIncludingSpaces(arg))
}
argsEscaped := make([]string, len(actionEntry.Arguments))
for i, arg := range actionEntry.Arguments {
if arg == "" {
// If this is an empty string, add ''
// And not
// 1. (literal empty)
// 2. `''\'''\'''` (escaped version of '')
//
// If we had used (1), then this would appear as a whitespace when we strings.Join
argsEscaped[i] = "''"
} else {
argsEscaped[i] = proptools.ShellEscapeIncludingSpaces(arg)
}
return strings.Join(argsEscaped, " ")
default:
return strings.Join(proptools.ShellEscapeListIncludingSpaces(actionEntry.Arguments), " ")
}
return strings.Join(argsEscaped, " ")
}
func (a *aqueryArtifactHandler) normalActionBuildStatement(actionEntry *analysis_v2_proto.Action) (*BuildStatement, error) {