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

Merge "Remove MainNinjaFile()"

Browse Source
This commit is contained in:
Treehugger Robot
2021-10-29 13:12:00 +00:00
committed by Gerrit Code Review
parent c874504988 65f298ca63
commit 3bf5986bb3
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/build/config.go
View File

@@ -796,10 +796,6 @@ func (c *configImpl) UsedEnvFile(tag string) string {
return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+tag) return shared.JoinPath(c.SoongOutDir(), usedEnvFile+"."+tag)
} }
func (c *configImpl) MainNinjaFile() string {
return shared.JoinPath(c.SoongOutDir(), "build.ninja")
}
func (c *configImpl) Bp2BuildMarkerFile() string { func (c *configImpl) Bp2BuildMarkerFile() string {
return shared.JoinPath(c.SoongOutDir(), ".bootstrap/bp2build_workspace_marker") return shared.JoinPath(c.SoongOutDir(), ".bootstrap/bp2build_workspace_marker")
} }

6
ui/build/soong.go
View File

@@ -170,7 +170,7 @@ func bootstrapBlueprint(ctx Context, config Config) {
ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap") ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap")
defer ctx.EndTrace() defer ctx.EndTrace()
mainSoongBuildExtraArgs := []string{"-o", config.MainNinjaFile()} mainSoongBuildExtraArgs := []string{"-o", config.SoongNinjaFile()}
if config.EmptyNinjaFile() { if config.EmptyNinjaFile() {
mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--empty-ninja-file") mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--empty-ninja-file")
} }
@@ -178,7 +178,7 @@ func bootstrapBlueprint(ctx Context, config Config) {
mainSoongBuildInvocation := primaryBuilderInvocation( mainSoongBuildInvocation := primaryBuilderInvocation(
config, config,
soongBuildTag, soongBuildTag,
config.MainNinjaFile(), config.SoongNinjaFile(),
mainSoongBuildExtraArgs) mainSoongBuildExtraArgs)
if config.bazelBuildMode() == mixedBuild { if config.bazelBuildMode() == mixedBuild {
@@ -401,7 +401,7 @@ func runSoong(ctx Context, config Config) {
if config.SoongBuildInvocationNeeded() { if config.SoongBuildInvocationNeeded() {
// This build generates <builddir>/build.ninja, which is used later by build/soong/ui/build/build.go#Build(). // This build generates <builddir>/build.ninja, which is used later by build/soong/ui/build/build.go#Build().
targets = append(targets, config.MainNinjaFile()) targets = append(targets, config.SoongNinjaFile())
} }
ninja("bootstrap", ".bootstrap/build.ninja", targets...) ninja("bootstrap", ".bootstrap/build.ninja", targets...)