Commit 48d9fb62 authored Sep 09, 2021 by Kousik Kumar Committed by Automerger Merge Worker Sep 09, 2021

Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev...

Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad747 am: dd28ec51 am: ea62b3d7

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

Change-Id: Idcf4325f0c3235961f15944fef3bbfcde9b255ec

cmd/soong_ui/main.go

+1 −2

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