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

Merge "Delete bazel-related files while bazel is off" into main

Browse Source
This commit is contained in:
Christopher Parsons
2023-10-31 15:00:17 +00:00
committed by Gerrit Code Review
parent a9ead6ef2b b6d6fc9c63
commit 9e5abfecc9
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/build/soong.go
View File

@@ -632,6 +632,10 @@ func runSoong(ctx Context, config Config) {
if config.BazelBuildEnabled() || config.Bp2Build() { if config.BazelBuildEnabled() || config.Bp2Build() {
checkEnvironmentFile(ctx, soongBuildEnv, config.UsedEnvFile(bp2buildFilesTag)) checkEnvironmentFile(ctx, soongBuildEnv, config.UsedEnvFile(bp2buildFilesTag))
} else {
// Remove bazel files in the event that bazel is disabled for the build.
// These files may have been left over from a previous bazel-enabled build.
cleanBazelFiles(config)
} }
if config.JsonModuleGraph() { if config.JsonModuleGraph() {
@@ -790,6 +794,18 @@ func loadSoongBuildMetrics(ctx Context, config Config, oldTimestamp time.Time) {
} }
} }
func cleanBazelFiles(config Config) {
files := []string{
shared.JoinPath(config.SoongOutDir(), "bp2build"),
shared.JoinPath(config.SoongOutDir(), "workspace"),
shared.JoinPath(config.SoongOutDir(), bazel.SoongInjectionDirName),
shared.JoinPath(config.OutDir(), "bazel")}
for _, f := range files {
os.RemoveAll(f)
}
}
func runMicrofactory(ctx Context, config Config, name string, pkg string, mapping map[string]string) { func runMicrofactory(ctx Context, config Config, name string, pkg string, mapping map[string]string) {
ctx.BeginTrace(metrics.RunSoong, name) ctx.BeginTrace(metrics.RunSoong, name)
defer ctx.EndTrace() defer ctx.EndTrace()