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

This commit is contained in:
Kousik Kumar 2021-09-09 20:27:45 +00:00 committed by Android (Google) Code Review
commit 9ecad7478f
1 changed files with 1 additions and 2 deletions

View File

@ -196,13 +196,12 @@ func main() {
Status: stat, Status: stat,
}} }}
config := c.config(buildCtx, args...)
if err := loadEnvConfig(); err != nil { if err := loadEnvConfig(); err != nil {
fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err) fmt.Fprintf(os.Stderr, "failed to parse env config files: %v", err)
os.Exit(1) os.Exit(1)
} }
config := c.config(buildCtx, args...)
build.SetupOutDir(buildCtx, config) build.SetupOutDir(buildCtx, config)