Commit dd28ec51 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 am: 9ecad747

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

Change-Id: I432a96406905bf64a1bad06ec0c902d372802346

parents b24137e0 9ecad747

cmd/soong_ui/main.go

+1 −2

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