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

Merge "Revert "Make glob output include product name"" into main

Browse Source
This commit is contained in:
Paul Duffin
2023-08-03 16:40:47 +00:00
committed by Gerrit Code Review
parent 4d730a8f14 d0e8180ea8
commit ff3fcd1f64
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/build/soong.go
View File

@@ -195,13 +195,9 @@ func (pb PrimaryBuilderFactory) primaryBuilderInvocation() bootstrap.PrimaryBuil
var allArgs []string var allArgs []string
allArgs = append(allArgs, pb.specificArgs...) allArgs = append(allArgs, pb.specificArgs...)
globPathName, ok := pb.config.TargetProductOrErr()
if ok != nil {
globPathName = pb.name
}
allArgs = append(allArgs, allArgs = append(allArgs,
"--globListDir", globPathName, "--globListDir", pb.name,
"--globFile", pb.config.NamedGlobFile(globPathName)) "--globFile", pb.config.NamedGlobFile(pb.name))
allArgs = append(allArgs, commonArgs...) allArgs = append(allArgs, commonArgs...)
allArgs = append(allArgs, environmentArgs(pb.config, pb.name)...) allArgs = append(allArgs, environmentArgs(pb.config, pb.name)...)