diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-09 20:27:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-09-09 20:27:45 +0000 |
| commit | 9ecad7478f585110f2d0eac33ef0e4a752c8d01d (patch) | |
| tree | b67b4dda3d967d44ecafda214926dd7273072791 | |
| parent | a510a2db107e15b7f413f3ee6e7d4fe8a70e7a55 (diff) | |
| parent | 008c2aa126f6fd9cde691c30d65e4f853c5d7fcd (diff) | |
| download | soong-9ecad7478f585110f2d0eac33ef0e4a752c8d01d.tar.gz | |
Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev
| -rw-r--r-- | cmd/soong_ui/main.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index 8453413c7..ffbe7de4f 100644 --- 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) |