StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using DIST_DIR in Soong

Browse Source 
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
This commit is contained in:
Dan Willemsen
2018-10-20 21:33:41 -07:00
parent d4ad1da3d7
commit 2d31a44b8a
6 changed files with 19 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ui/build/kati.go
View File

@@ -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) {})
}