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

Merge "Invoke writeNinjaHint for only actual build"

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-15 06:13:42 +00:00
committed by Gerrit Code Review
parent 1f65e0d0a2 591366dd63
commit df9ae5c9bc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/soong_build/main.go
View File

@@ -133,6 +133,10 @@ func runMixedModeBuild(ctx *android.Context, extraNinjaDeps []string) string {
ninjaDeps = append(ninjaDeps, writeBuildGlobsNinjaFile(ctx)...) ninjaDeps = append(ninjaDeps, writeBuildGlobsNinjaFile(ctx)...)
writeDepFile(cmdlineArgs.OutFile, ctx.EventHandler, ninjaDeps) writeDepFile(cmdlineArgs.OutFile, ctx.EventHandler, ninjaDeps)
if ctx.Config().IsEnvTrue("SOONG_GENERATES_NINJA_HINT") {
writeNinjaHint(ctx)
}
return cmdlineArgs.OutFile return cmdlineArgs.OutFile
} }
@@ -455,6 +459,9 @@ func runSoongOnlyBuild(ctx *android.Context, extraNinjaDeps []string) string {
// The actual output (build.ninja) was written in the RunBlueprint() call // The actual output (build.ninja) was written in the RunBlueprint() call
// above // above
writeDepFile(cmdlineArgs.OutFile, ctx.EventHandler, ninjaDeps) writeDepFile(cmdlineArgs.OutFile, ctx.EventHandler, ninjaDeps)
if ctx.Config().IsEnvTrue("SOONG_GENERATES_NINJA_HINT") {
writeNinjaHint(ctx)
}
return cmdlineArgs.OutFile return cmdlineArgs.OutFile
} }
} }
@@ -535,9 +542,6 @@ func main() {
} else { } else {
finalOutputFile = runSoongOnlyBuild(ctx, extraNinjaDeps) finalOutputFile = runSoongOnlyBuild(ctx, extraNinjaDeps)
} }
if ctx.Config().IsEnvTrue("SOONG_GENERATES_NINJA_HINT") {
writeNinjaHint(ctx)
}
writeMetrics(configuration, ctx.EventHandler, metricsDir) writeMetrics(configuration, ctx.EventHandler, metricsDir)
} }
writeUsedEnvironmentFile(configuration) writeUsedEnvironmentFile(configuration)