Commit 50c2a1b2 authored Aug 31, 2021 by Kousik Kumar Committed by Automerger Merge Worker Aug 31, 2021

Load env variables before c.config() am: 062b0115 am: ef9d91b7

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

Change-Id: I5574eba839d8e186a3fff27b5198ab34ec10e1ce

parents 0b7859c0 ef9d91b7

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)