Merge "Always ensure that DIST_DIR is set"
am: 251178f024
Change-Id: I8a303a7f5f36349a937003739dd1b7b00da68e0c
This commit is contained in:
commit
b2aba00619
|
@ -86,6 +86,9 @@ func NewConfig(ctx Context, args ...string) Config {
|
||||||
ret.environ.Set("OUT_DIR", outDir)
|
ret.environ.Set("OUT_DIR", outDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make sure DIST_DIR is set appropriately
|
||||||
|
ret.environ.Set("DIST_DIR", ret.DistDir())
|
||||||
|
|
||||||
ret.environ.Unset(
|
ret.environ.Unset(
|
||||||
// We're already using it
|
// We're already using it
|
||||||
"USE_SOONG_UI",
|
"USE_SOONG_UI",
|
||||||
|
|
Loading…
Reference in New Issue