Merge "Always ensure that DIST_DIR is set"

am: 251178f024 Change-Id: I8a303a7f5f36349a937003739dd1b7b00da68e0c
2018-10-17 10:37:43 -07:00 · 2018-10-17 10:37:43 -07:00 · b2aba00619
parent 043a41bbd9 251178f024
commit b2aba00619
1 changed files with 3 additions and 0 deletions
--- a/ui/build/config.go
+++ b/ui/build/config.go
@ -86,6 +86,9 @@ func NewConfig(ctx Context, args ...string) Config {
 		ret.environ.Set("OUT_DIR", outDir)
 	}

+	// Make sure DIST_DIR is set appropriately
+	ret.environ.Set("DIST_DIR", ret.DistDir())
+
 	ret.environ.Unset(
 		// We're already using it
 		"USE_SOONG_UI",