diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-07 14:55:52 +0000 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2021-09-08 07:37:19 +0000 |
| commit | 008c2aa126f6fd9cde691c30d65e4f853c5d7fcd (patch) | |
| tree | cb97eb2f39f424291a92808980086d5e3cdf0387 | |
| parent | 4e88859af01376b9977bcc03174c182353c172d4 (diff) | |
Revert "Revert "Load env variables before c.config()""
This reverts commit 4e88859af01376b9977bcc03174c182353c172d4.
Reason for revert: Given https://googleplex-android-review.git.corp.google.com/c/platform/build/soong/+/15747538, we should be able to rollforward with this now.
Bug: b/198045383
Change-Id: I4c069e952d9f77258433b5059f3867293993a64d
| -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) |