Merge "Always ensure that DIST_DIR is set"

2018-10-17 15:26:38 +00:00
parent ac857603ce d50e89f389
commit 251178f024
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",