Commit 4e88859a authored Sep 01, 2021 by Kousik Kumar

Revert "Load env variables before c.config()"

This reverts commit 062b0115.

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

parent 062b0115

cmd/soong_ui/main.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)