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

Merge "Remove MainNinjaFile()" am: 3bf5986bb3

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

Change-Id: I00ca2e67995e5da1486165b897a46089314f3873
This commit is contained in:
Treehugger Robot
2021-10-29 13:26:31 +00:00
committed by Automerger Merge Worker
parent e6de0ed5b8 3bf5986bb3
commit 0dcc020ae4
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)
}
func (c *configImpl) MainNinjaFile() string {
return shared.JoinPath(c.SoongOutDir(), "build.ninja")
}
func (c *configImpl) Bp2BuildMarkerFile() string {
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")
defer ctx.EndTrace()
mainSoongBuildExtraArgs := []string{"-o", config.MainNinjaFile()}
mainSoongBuildExtraArgs := []string{"-o", config.SoongNinjaFile()}
if config.EmptyNinjaFile() {
mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--empty-ninja-file")
}
@@ -178,7 +178,7 @@ func bootstrapBlueprint(ctx Context, config Config) {
mainSoongBuildInvocation := primaryBuilderInvocation(
config,
soongBuildTag,
config.MainNinjaFile(),
config.SoongNinjaFile(),
mainSoongBuildExtraArgs)
if config.bazelBuildMode() == mixedBuild {
@@ -401,7 +401,7 @@ func runSoong(ctx Context, config Config) {
if config.SoongBuildInvocationNeeded() {
// 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...)