Merge "Always ensure that DIST_DIR is set"

This commit is contained in:
Treehugger Robot
2018-10-17 15:26:38 +00:00
committed by Gerrit Code Review

View File

@@ -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",