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
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go
index ffbe7de..8453413 100644
--- a/cmd/soong_ui/main.go
+++ b/cmd/soong_ui/main.go
@@ -196,12 +196,13 @@
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)