Commit 062b0115 authored Aug 31, 2021 by Kousik Kumar

Load env variables before c.config()

If the env variables are loaded after the config object is created, they aren't set in the Environment object inside the config object which causes RBE to not work

Bug: b/198045383
Test: Tested by running a build against rvc-dev branch and ensuring it works.
Change-Id: I509289467df81e5535b4cbbfe4e5eb336c0e4e59

parent 907bbdfc

cmd/soong_ui/main.go

+1 −2

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