diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-02-09 02:10:06 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-09 02:10:07 +0000 |
commit | 62944779e21c4488e99d9a8a91326129acb77eeb (patch) | |
tree | 4a81262a2c2fcb12d6df5b9c27d840b6fd292678 /ui | |
parent | 89a0d797d71defd969a3ca9130cdb99c04c59d94 (diff) | |
parent | 8a073a8b7ba74f7efe6141ab6a575c881b87e40f (diff) | |
download | build_soong-62944779e21c4488e99d9a8a91326129acb77eeb.tar.gz build_soong-62944779e21c4488e99d9a8a91326129acb77eeb.tar.bz2 build_soong-62944779e21c4488e99d9a8a91326129acb77eeb.zip |
Merge "Ship the build log and trace on the build servers"
Diffstat (limited to 'ui')
-rw-r--r-- | ui/build/config.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index 35c5213d..4853643c 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -35,6 +35,7 @@ type configImpl struct { parallel int keepGoing int verbose bool + dist bool // From the product config katiArgs []string @@ -90,6 +91,8 @@ func NewConfig(ctx Context, args ...string) Config { } else if arg == "showcommands" { ret.verbose = true continue + } else if arg == "dist" { + ret.dist = true } if arg[0] == '-' { var err error @@ -183,6 +186,13 @@ func (c *configImpl) OutDir() string { return "out" } +func (c *configImpl) DistDir() string { + if distDir, ok := c.environ.Get("DIST_DIR"); ok { + return distDir + } + return filepath.Join(c.OutDir(), "dist") +} + func (c *configImpl) NinjaArgs() []string { return c.ninjaArgs } @@ -198,6 +208,10 @@ func (c *configImpl) KatiSuffix() string { panic("SetKatiSuffix has not been called") } +func (c *configImpl) Dist() bool { + return c.dist +} + func (c *configImpl) IsVerbose() bool { return c.verbose } |