commit df9ae5c9bc73ac707c2744f6179fe3aa2df8d28e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon May 15 06:13:42 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 15 06:13:42 2023 +0000
tree 9b54306ee2e8a7701aede1115eaad1b602bc9b84
parent 1f65e0d0a25f8a7413f23f02e5aba62894d0392f
parent 591366dd63303dff6773f6d48cc71666fc9d1baa

Merge "Invoke writeNinjaHint for only actual build"

cmd/soong_build/main.go

diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index 10b09d3..cf6c1c7 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)