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

Merge "Make glob output include product name" into main am: 4d730a8f14 am: e64a844b48 am: c91f36ab7a

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

Change-Id: I251519d89831847e958866971c159ac714a774f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-03 03:12:51 +00:00
committed by Automerger Merge Worker
parent 2c833ba8e5 c91f36ab7a
commit 8303eb4a55
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ui/build/soong.go
View File

@@ -195,9 +195,13 @@ 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", pb.name, "--globListDir", globPathName,
"--globFile", pb.config.NamedGlobFile(pb.name)) "--globFile", pb.config.NamedGlobFile(globPathName))
allArgs = append(allArgs, commonArgs...) allArgs = append(allArgs, commonArgs...)
allArgs = append(allArgs, environmentArgs(pb.config, pb.name)...) allArgs = append(allArgs, environmentArgs(pb.config, pb.name)...)