| commit | 251178f024b95b4441aeb457a0a07d26e776bace | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Oct 17 15:26:38 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 17 15:26:38 2018 +0000 |
| tree | 3a6c9bcd4be1fd2f37f88c372c0b1ab2f2e78988 | |
| parent | ac857603cea9bf82f22a2c500c7da7536b1e8ce0 [diff] | |
| parent | d50e89f389cade8f1fc359cca2463a8534b766c2 [diff] |
Merge "Always ensure that DIST_DIR is set"
diff --git a/ui/build/config.go b/ui/build/config.go index d470b96..d65d97f 100644 --- a/ui/build/config.go +++ b/ui/build/config.go
@@ -86,6 +86,9 @@ 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",