Merge "Delete bazel-related files while bazel is off" into main (9e5abfec) · Commits · e / os / android_build_soong

ui/build/soong.go

+16 −0

Original line number	Diff line number	Diff line
		@@ -632,6 +632,10 @@ func runSoong(ctx Context, config Config) {

		if config.BazelBuildEnabled() \|\| config.Bp2Build() {
		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() {
		@@ -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) {
		ctx.BeginTrace(metrics.RunSoong, name)
		defer ctx.EndTrace()