Merge "Revert "Revert "Load env variables before c.config()""" into rvc-dev am: 9ecad7478f
am: dd28ec5116
am: ea62b3d743
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15778291 Change-Id: I82ea559e164493d246102f97aa1e432f5d124fe8
This commit is contained in:
commit
afe8619e1b
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue