| commit | 9ee45ad09a949a1b94e2867c91c0f70b932a5e71 | [log] [tgz] |
|---|---|---|
| author | Kousik Kumar <kousikk@google.com> | Thu Sep 02 00:18:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 02 00:18:52 2021 +0000 |
| tree | 1c7345329fccf3d5e8395acaf057963ce76214af | |
| parent | f04dc7f1b1f4f40cacd362a2461c643122b05f48 [diff] | |
| parent | 4e88859af01376b9977bcc03174c182353c172d4 [diff] |
Revert "Load env variables before c.config()" am: 4e88859af0 Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15741350 Change-Id: I954c16917928fe1e4eace7209558b42d517c14ab
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index c9d80d5..ffe502a 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go
@@ -195,12 +195,13 @@ 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)