tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Delete bazel-related files while bazel is off

Browse source 
Bug: 189485959
Test: Manually verified that files are removed
Test: Presubmits
Change-Id: Ia279937d6d335174776ff661ab20c7821b979ca7
This commit is contained in:
Chris Parsons 2023-10-30 16:21:06 +00:00
parent ee44d32add
commit b6d6fc9c63
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui/build/soong.go
View file

@ -631,6 +631,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() {
@ -776,6 +780,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()