diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-02 00:58:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 00:58:51 +0000 |
| commit | f46fc703f2924aab749542abe35d244aeb4b3da3 (patch) | |
| tree | 83e8a1783409613c0100b33502683df6541aeee0 | |
| parent | b421756b527b6c664460e331cd081e3d57c51698 (diff) | |
| parent | 8c1a61a30f88bd649111a8ef8a9ac5f8e2151627 (diff) | |
Revert "Load env variables before c.config()" am: 4e88859af0 am: 51c318f403 am: e41ee225ae am: 8c1a61a30f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350
Change-Id: I05a70f3e67d1ac3638d0c113ba3787c276e97b09
| -rw-r--r-- | cmd/soong_ui/main.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index 02c522977..8bcc71202 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -205,12 +205,13 @@ 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) |