diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-08-31 17:50:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-31 17:50:32 +0000 |
| commit | 50c2a1b2a40ca1638fb4bbd60958d593fcd8702d (patch) | |
| tree | 3ab71c365f152fab17ebc9b23d29ef674f8c43dc | |
| parent | 0b7859c0d91de9d7a8cd84c9fd21b7b6ff8d47ae (diff) | |
| parent | ef9d91b7ac0647efa10d92c357d3a4942018011e (diff) | |
Load env variables before c.config() am: 062b011502 am: ef9d91b7ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183
Change-Id: I5574eba839d8e186a3fff27b5198ab34ec10e1ce
| -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 8bcc71202..02c522977 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -205,13 +205,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) |