tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Jeongik Cha 2023-08-22 04:41:43 +00:00 committed by Gerrit Code Review
commit 962bcdb18e
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ui/build/soong.go
View file

@ -161,6 +161,14 @@ type PrimaryBuilderFactory struct {
debugPort string debugPort string
} }
func getGlobPathName(config Config) string {
globPathName, ok := config.TargetProductOrErr()
if ok != nil {
globPathName = soongBuildTag
}
return globPathName
}
func (pb PrimaryBuilderFactory) primaryBuilderInvocation() bootstrap.PrimaryBuilderInvocation { func (pb PrimaryBuilderFactory) primaryBuilderInvocation() bootstrap.PrimaryBuilderInvocation {
commonArgs := make([]string, 0, 0) commonArgs := make([]string, 0, 0)
@ -195,9 +203,14 @@ func (pb PrimaryBuilderFactory) primaryBuilderInvocation() bootstrap.PrimaryBuil
var allArgs []string var allArgs []string
allArgs = append(allArgs, pb.specificArgs...) allArgs = append(allArgs, pb.specificArgs...)
globPathName := pb.name
// Glob path for soong build would be separated per product target
if pb.name == soongBuildTag {
globPathName = getGlobPathName(pb.config)
}
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)...)
@ -247,7 +260,7 @@ func bootstrapEpochCleanup(ctx Context, config Config) {
func bootstrapGlobFileList(config Config) []string { func bootstrapGlobFileList(config Config) []string {
return []string{ return []string{
config.NamedGlobFile(soongBuildTag), config.NamedGlobFile(getGlobPathName(config)),
config.NamedGlobFile(bp2buildFilesTag), config.NamedGlobFile(bp2buildFilesTag),
config.NamedGlobFile(jsonModuleGraphTag), config.NamedGlobFile(jsonModuleGraphTag),
config.NamedGlobFile(queryviewTag), config.NamedGlobFile(queryviewTag),