Commit e41ee225 authored Sep 02, 2021 by Kousik Kumar Committed by Automerger Merge Worker Sep 02, 2021

Revert "Load env variables before c.config()" am: 4e88859a am: 51c318f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350

Change-Id: Ia229ea5263a3456015ad2d446ce9f77f5e7639d0

parents de85899f 51c318f4

cmd/soong_ui/main.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -205,12 +205,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)