diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-01 21:47:02 +0000 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2021-09-01 22:16:51 +0000 |
| commit | 4e88859af01376b9977bcc03174c182353c172d4 (patch) | |
| tree | a162ae806a3f656ab660a055f48faba59696ce84 | |
| parent | 062b01150268a75aad27693bbf29416b4da651d5 (diff) | |
Revert "Load env variables before c.config()"
This reverts commit 062b01150268a75aad27693bbf29416b4da651d5.
Reason for revert: This change is accidentally opting in a bunch of people into RBE because we aren't respecting USE_RBE variable in rvc-dev branch (possibly missing cherry-pick of some earlier fix).
Merged-In: I416e8da75f84aa2b53995f525cf50501488dc972
Change-Id: Ic678b63b165deb3ac4ec3d3c5cbc166621d8eec3
| -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 ffbe7de4f..8453413c7 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -196,12 +196,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) |