diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-08-31 18:27:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-31 18:27:41 +0000 |
| commit | df4ac9c32af6a112e55cf561eb8aa78e025a87df (patch) | |
| tree | 0280955ddef3e77322e864b36e2693a8e80147ef | |
| parent | 4669614b92a9ccbaa593bb31d34ec7cfd10756dd (diff) | |
| parent | 073f79b50c0e091f2ee2449d6a11998148b89e64 (diff) | |
Load env variables before c.config() am: 062b011502 am: ef9d91b7ac am: 50c2a1b2a4 am: 073f79b50c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15723183
Change-Id: Ie6c1cc271eea3efcfd481e972e4d8cc184c6c2e8
| -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) |