From d50e89f389cade8f1fc359cca2463a8534b766c2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 16 Oct 2018 17:49:25 -0700 Subject: [PATCH] Always ensure that DIST_DIR is set Set the default value if one isn't provided. Test: `get_build_var DIST_DIR` after removing the default setting in envsetup.mk Change-Id: I0cb310fc65f7747c36de14608b61786ef6863fd1 --- ui/build/config.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/build/config.go b/ui/build/config.go index d470b960d..d65d97f28 100644 --- 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",