Merge "Turn on bp2build_deps by default" into main

android/bazel.go

@@ -634,9 +634,6 @@ func bp2buildDefaultTrueRecursively(packagePath string, config allowlists.Bp2Bui
 
 func registerBp2buildConversionMutator(ctx RegisterMutatorsContext) {
 	ctx.BottomUp("bp2build_conversion", bp2buildConversionMutator).Parallel()
-}
-
-func registerBp2buildDepsMutator(ctx RegisterMutatorsContext) {
 	ctx.BottomUp("bp2build_deps", bp2buildDepsMutator).Parallel()
 }
 

android/config.go

@@ -306,9 +306,6 @@ type config struct {
 	// in tests when a path doesn't exist.
 	TestAllowNonExistentPaths bool
 
-	// If true, register the "bp2build_deps" mutator in the mutator pipeline.
-	Bp2buildDepsMutator bool
-
 	// The list of files that when changed, must invalidate soong_build to
 	// regenerate build.ninja.
 	ninjaFileDepsSet sync.Map

android/mutator.go

@@ -35,9 +35,6 @@ import (
 // RegisterMutatorsForBazelConversion is a alternate registration pipeline for bp2build. Exported for testing.
 func RegisterMutatorsForBazelConversion(ctx *Context, preArchMutators []RegisterMutatorFunc) {
 	bp2buildMutators := append(preArchMutators, registerBp2buildConversionMutator)
-	if ctx.config.Bp2buildDepsMutator {
-		bp2buildMutators = append(bp2buildMutators, registerBp2buildDepsMutator)
-	}
 	registerMutatorsForBazelConversion(ctx, bp2buildMutators)
 }