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 am: baf4427959

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

Change-Id: I0e3663c8a4f461cacd4fb7dd6623340f816f20b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2023-08-03 19:45:18 +00:00
committed by Automerger Merge Worker
parent d46df6c68a baf4427959
commit f004f19f51
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)...)