Invoke writeNinjaHint for only actual build
Bug: 273282046
Test: m nothing
Change-Id: I13754646c786b0cfee8c8d75a8b61e62b54c32ba
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index 5de2326..27219b1 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -133,6 +133,10 @@
ninjaDeps = append(ninjaDeps, writeBuildGlobsNinjaFile(ctx)...)
writeDepFile(cmdlineArgs.OutFile, ctx.EventHandler, ninjaDeps)
+
+ if ctx.Config().IsEnvTrue("SOONG_GENERATES_NINJA_HINT") {
+ writeNinjaHint(ctx)
+ }
return cmdlineArgs.OutFile
}
@@ -455,6 +459,9 @@
// The actual output (build.ninja) was written in the RunBlueprint() call
// above
writeDepFile(cmdlineArgs.OutFile, ctx.EventHandler, ninjaDeps)
+ if ctx.Config().IsEnvTrue("SOONG_GENERATES_NINJA_HINT") {
+ writeNinjaHint(ctx)
+ }
return cmdlineArgs.OutFile
}
}
@@ -535,9 +542,6 @@
} else {
finalOutputFile = runSoongOnlyBuild(ctx, extraNinjaDeps)
}
- if ctx.Config().IsEnvTrue("SOONG_GENERATES_NINJA_HINT") {
- writeNinjaHint(ctx)
- }
writeMetrics(configuration, ctx.EventHandler, metricsDir)
}
writeUsedEnvironmentFile(configuration, finalOutputFile)