commit 6d3e72688729ea72bf64f1e7dacccc5b57f384be
author Paul Duffin <paulduffin@google.com> Sat Mar 06 10:09:15 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 06 10:09:15 2021 +0000
tree 3f99f30135b1acae1a7e81b8e751b06283902ecb
parent 77bfa3e7925060786af5bd5bcad56878320d92d4
parent cdcd2be1ffee4a66ee7786edf7bb9c960d4a6c55

Merge "Fix build break caused by registering genrules twice"

ui/build/soong.go

diff --git a/ui/build/soong.go b/ui/build/soong.go
index fc43663..242282b 100644
--- a/ui/build/soong.go
+++ b/ui/build/soong.go
@@ -110,7 +110,10 @@
 		soongBuildEnv.Set("SOONG_DELVE_PATH", shared.ResolveDelveBinary())
 	}
 
-	writeEnvironmentFile(ctx, envFile, soongBuildEnv.AsMap())
+	err := writeEnvironmentFile(ctx, envFile, soongBuildEnv.AsMap())
+	if err != nil {
+		ctx.Fatalf("failed to write environment file %s: %s", envFile, err)
+	}
 
 	func() {
 		ctx.BeginTrace(metrics.RunSoong, "environment check")