diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-10-20 21:33:41 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-10-20 21:33:41 -0700 |
| commit | 2d31a44b8a4ec24e98052bd8f5aac29ba2ec912c (patch) | |
| tree | 38b67f36b954ffe7fd36af197d8e815a5d9459ed /ui/build/kati.go | |
| parent | d4ad1da3d772b346b5858fc5bee96e6996990e6f (diff) | |
| download | build_soong-2d31a44b8a4ec24e98052bd8f5aac29ba2ec912c.tar.gz build_soong-2d31a44b8a4ec24e98052bd8f5aac29ba2ec912c.tar.bz2 build_soong-2d31a44b8a4ec24e98052bd8f5aac29ba2ec912c.zip | |
Stop using DIST_DIR in Soong
We're only using it to distribute files in case of failure, which isn't
well supported currently, but can be handled for now by using the
DIST_DIR environment variable during the command execution.
This was at least one cause that we'd be re-running Soong during every
build server build, as the DIST_DIR values are unique.
Test: m dist
Change-Id: Ibd5e6b6c46695350de80b745bfb6a6aa685033a0
Diffstat (limited to 'ui/build/kati.go')
| -rw-r--r-- | ui/build/kati.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ui/build/kati.go b/ui/build/kati.go index b3e820e2..56e9a88a 100644 --- a/ui/build/kati.go +++ b/ui/build/kati.go @@ -129,9 +129,7 @@ func runKatiBuild(ctx Context, config Config) { "TARGET_DEVICE_DIR="+config.TargetDeviceDir(), "KATI_PACKAGE_MK_DIR="+config.KatiPackageMkDir()) - runKati(ctx, config, katiBuildSuffix, args, func(env *Environment) { - env.Unset("DIST_DIR") - }) + runKati(ctx, config, katiBuildSuffix, args, func(env *Environment) {}) } func runKatiPackage(ctx Context, config Config) { @@ -170,6 +168,7 @@ func runKatiPackage(ctx Context, config Config) { if config.Dist() { env.Set("DIST", "true") + env.Set("DIST_DIR", config.DistDir()) } }) } @@ -184,7 +183,5 @@ func runKatiCleanSpec(ctx Context, config Config) { "-f", "build/make/core/cleanbuild.mk", "SOONG_MAKEVARS_MK=" + config.SoongMakeVarsMk(), "TARGET_DEVICE_DIR=" + config.TargetDeviceDir(), - }, func(env *Environment) { - env.Unset("DIST_DIR") - }) + }, func(env *Environment) {}) } |