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

Merge "bootstrap glob file list in one place"

Browse Source
This commit is contained in:
Usta Shrestha
2022-08-10 15:07:17 +00:00
committed by Gerrit Code Review
parent 8c7c58ae65 9b3724ad74
commit 50e02aaf76
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ui/build/soong.go
View File

@@ -312,14 +312,6 @@ func bootstrapBlueprint(ctx Context, config Config) {
fmt.Sprintf("generating Soong docs at %s", config.SoongDocsHtml()), fmt.Sprintf("generating Soong docs at %s", config.SoongDocsHtml()),
) )
globFiles := []string{
config.NamedGlobFile(soongBuildTag),
config.NamedGlobFile(bp2buildTag),
config.NamedGlobFile(jsonModuleGraphTag),
config.NamedGlobFile(queryviewTag),
config.NamedGlobFile(soongDocsTag),
}
// The glob .ninja files are subninja'd. However, they are generated during // The glob .ninja files are subninja'd. However, they are generated during
// the build itself so we write an empty file if the file does not exist yet // the build itself so we write an empty file if the file does not exist yet
// so that the subninja doesn't fail on clean builds // so that the subninja doesn't fail on clean builds
@@ -342,7 +334,7 @@ func bootstrapBlueprint(ctx Context, config Config) {
runGoTests: !config.skipSoongTests, runGoTests: !config.skipSoongTests,
// If we want to debug soong_build, we need to compile it for debugging // If we want to debug soong_build, we need to compile it for debugging
debugCompilation: os.Getenv("SOONG_DELVE") != "", debugCompilation: os.Getenv("SOONG_DELVE") != "",
subninjas: globFiles, subninjas: bootstrapGlobFileList(config),
primaryBuilderInvocations: []bootstrap.PrimaryBuilderInvocation{ primaryBuilderInvocations: []bootstrap.PrimaryBuilderInvocation{
mainSoongBuildInvocation, mainSoongBuildInvocation,
bp2buildInvocation, bp2buildInvocation,