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
diff --git a/ui/build/kati.go b/ui/build/kati.go
index b3e820e..56e9a88 100644
--- a/ui/build/kati.go
+++ b/ui/build/kati.go
@@ -129,9 +129,7 @@
"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 @@
if config.Dist() {
env.Set("DIST", "true")
+ env.Set("DIST_DIR", config.DistDir())
}
})
}
@@ -184,7 +183,5 @@
"-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) {})
}