Touch soong_build output at the end of main
This fixes an incrementality bug that resulted in superfluous
build.ninja regeneration after a new glob definition is added.
Fixes: 279674820
Test: Treehugger
Test; New integration test in this CL
Change-Id: Ifefe66a0eb1c125e9ad5373d60437a1cb1e6fdec
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index 5de2326..10b09d3 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -540,10 +540,16 @@
}
writeMetrics(configuration, ctx.EventHandler, metricsDir)
}
- writeUsedEnvironmentFile(configuration, finalOutputFile)
+ writeUsedEnvironmentFile(configuration)
+
+ // Touch the output file so that it's the newest file created by soong_build.
+ // This is necessary because, if soong_build generated any files which
+ // are ninja inputs to the main output file, then ninja would superfluously
+ // rebuild this output file on the next build invocation.
+ touch(shared.JoinPath(topDir, finalOutputFile))
}
-func writeUsedEnvironmentFile(configuration android.Config, finalOutputFile string) {
+func writeUsedEnvironmentFile(configuration android.Config) {
if usedEnvFile == "" {
return
}
@@ -562,11 +568,6 @@
}
err = os.WriteFile(path, data, 0666)
maybeQuit(err, "error writing used environment file '%s'", usedEnvFile)
-
- // Touch the output file so that it's not older than the file we just
- // wrote. We can't write the environment file earlier because one an access
- // new environment variables while writing it.
- touch(shared.JoinPath(topDir, finalOutputFile))
}
func touch(path string) {