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 am: ff3fcd1f64 am: 5d23bb7d4b am: 571db59b84

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

Change-Id: Id50084ed47ea9c76b47062b5f948bca7be5ed184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2023-08-03 18:58:16 +00:00
committed by Automerger Merge Worker
parent 8303eb4a55 571db59b84
commit baf4427959
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
allArgs = append(allArgs, pb.specificArgs...)
globPathName, ok := pb.config.TargetProductOrErr()
if ok != nil {
globPathName = pb.name
}
allArgs = append(allArgs,
"--globListDir", globPathName,
"--globFile", pb.config.NamedGlobFile(globPathName))
"--globListDir", pb.name,
"--globFile", pb.config.NamedGlobFile(pb.name))
allArgs = append(allArgs, commonArgs...)
allArgs = append(allArgs, environmentArgs(pb.config, pb.name)...)