Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev

2021-09-09 20:27:45 +00:00 · 2021-09-09 20:27:45 +00:00 · 9ecad7478f
parent a510a2db10 008c2aa126
commit 9ecad7478f
1 changed files with 1 additions and 2 deletions
--- a/cmd/soong_ui/main.go
+++ b/cmd/soong_ui/main.go
@ -196,13 +196,12 @@ func main() {
 		Status:  stat,
 	}}

-	config := c.config(buildCtx, args...)
-
 	if err := loadEnvConfig(); err != nil {
 		fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err)
 		os.Exit(1)
 	}

+	config := c.config(buildCtx, args...)

 	build.SetupOutDir(buildCtx, config)