Remove bazel dev mode
This mode is no longer in use, and is dead code.
Fixes: 282809863
Test: Presubmits
Change-Id: I45ab7d7c9dee153f1cbc66262c2cf9f1e9487a28
diff --git a/android/bazel_handler.go b/android/bazel_handler.go
index 4645e6b..2e818b1 100644
--- a/android/bazel_handler.go
+++ b/android/bazel_handler.go
@@ -257,8 +257,6 @@
bazelEnabledModules map[string]bool
// DCLA modules are enabled when used in apex.
bazelDclaEnabledModules map[string]bool
- // If true, modules are bazel-enabled by default, unless present in bazelDisabledModules.
- modulesDefaultToBazel bool
targetProduct string
targetBuildVariant string
@@ -525,10 +523,8 @@
for enabledAdHocModule := range forceEnabled {
enabledModules[enabledAdHocModule] = true
}
- case BazelDevMode:
- AddToStringSet(disabledModules, allowlists.MixedBuildsDisabledList)
default:
- panic("Expected BazelProdMode, BazelStagingMode, or BazelDevMode")
+ panic("Expected BazelProdMode or BazelStagingMode")
}
return enabledModules, disabledModules
}
@@ -546,7 +542,7 @@
}
func NewBazelContext(c *config) (BazelContext, error) {
- if c.BuildMode != BazelProdMode && c.BuildMode != BazelStagingMode && c.BuildMode != BazelDevMode {
+ if c.BuildMode != BazelProdMode && c.BuildMode != BazelStagingMode {
return noopBazelContext{}, nil
}
@@ -610,7 +606,6 @@
return &mixedBuildBazelContext{
bazelRunner: &builtinBazelRunner{c.UseBazelProxy, absolutePath(c.outDir)},
paths: &paths,
- modulesDefaultToBazel: c.BuildMode == BazelDevMode,
bazelEnabledModules: enabledModules,
bazelDisabledModules: disabledModules,
bazelDclaEnabledModules: dclaEnabledModules,
@@ -634,7 +629,7 @@
return true
}
- return context.modulesDefaultToBazel
+ return false
}
func (context *mixedBuildBazelContext) IsModuleDclaAllowed(moduleName string) bool {
diff --git a/android/bazel_handler_test.go b/android/bazel_handler_test.go
index b17b765..a81a878 100644
--- a/android/bazel_handler_test.go
+++ b/android/bazel_handler_test.go
@@ -263,7 +263,6 @@
}
bazelContext := &mixedBuildBazelContext{
- modulesDefaultToBazel: false,
bazelEnabledModules: enabledModules,
bazelDisabledModules: disabledModules,
bazelDclaEnabledModules: dclaEnabledModules,
diff --git a/android/config.go b/android/config.go
index 90dbe0b..60c3e9b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -96,7 +96,6 @@
MultitreeBuild bool
BazelMode bool
- BazelModeDev bool
BazelModeStaging bool
BazelForceEnabledModules string
@@ -132,11 +131,6 @@
// Generate a documentation file for module type definitions and exit.
GenerateDocFile
- // Use bazel during analysis of many allowlisted build modules. The allowlist
- // is considered a "developer mode" allowlist, as some modules may be
- // allowlisted on an experimental basis.
- BazelDevMode
-
// Use bazel during analysis of a few allowlisted build modules. The allowlist
// is considered "staging, as these are modules being prepared to be released
// into prod mode shortly after.
@@ -622,7 +616,6 @@
setBuildMode(cmdArgs.BazelApiBp2buildDir, ApiBp2build)
setBuildMode(cmdArgs.ModuleGraphFile, GenerateModuleGraph)
setBuildMode(cmdArgs.DocFile, GenerateDocFile)
- setBazelMode(cmdArgs.BazelModeDev, "--bazel-mode-dev", BazelDevMode)
setBazelMode(cmdArgs.BazelMode, "--bazel-mode", BazelProdMode)
setBazelMode(cmdArgs.BazelModeStaging, "--bazel-mode-staging", BazelStagingMode)
@@ -726,7 +719,7 @@
return true
}).(bool)
- bazelModeEnabled := c.BuildMode == BazelProdMode || c.BuildMode == BazelDevMode || c.BuildMode == BazelStagingMode
+ bazelModeEnabled := c.BuildMode == BazelProdMode || c.BuildMode == BazelStagingMode
return globalMixedBuildsSupport && bazelModeEnabled
}
diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go
index 0212075..b897bb5 100644
--- a/cmd/multiproduct_kati/main.go
+++ b/cmd/multiproduct_kati/main.go
@@ -50,7 +50,6 @@
var bazelMode = flag.Bool("bazel-mode", false, "use bazel for analysis of certain modules")
var bazelModeStaging = flag.Bool("bazel-mode-staging", false, "use bazel for analysis of certain near-ready modules")
-var bazelModeDev = flag.Bool("bazel-mode-dev", false, "use bazel for analysis of a large number of modules (less stable)")
var onlyConfig = flag.Bool("only-config", false, "Only run product config (not Soong or Kati)")
var onlySoong = flag.Bool("only-soong", false, "Only run product config and Soong (not Kati)")
@@ -229,10 +228,6 @@
count++
str = "--bazel-mode-staging"
}
- if *bazelModeDev {
- count++
- str = "--bazel-mode-dev"
- }
if count > 1 {
// Can't set more than one
diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index d2eadba..52b2d26 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -86,7 +86,6 @@
flag.BoolVar(&cmdlineArgs.MultitreeBuild, "multitree-build", false, "this is a multitree build")
flag.BoolVar(&cmdlineArgs.BazelMode, "bazel-mode", false, "use bazel for analysis of certain modules")
flag.BoolVar(&cmdlineArgs.BazelModeStaging, "bazel-mode-staging", false, "use bazel for analysis of certain near-ready modules")
- flag.BoolVar(&cmdlineArgs.BazelModeDev, "bazel-mode-dev", false, "use bazel for analysis of a large number of modules (less stable)")
flag.BoolVar(&cmdlineArgs.UseBazelProxy, "use-bazel-proxy", false, "communicate with bazel using unix socket proxy instead of spawning subprocesses")
flag.BoolVar(&cmdlineArgs.BuildFromTextStub, "build-from-text-stub", false, "build Java stubs from API text files instead of source files")
flag.BoolVar(&cmdlineArgs.EnsureAllowlistIntegrity, "ensure-allowlist-integrity", false, "verify that allowlisted modules are mixed-built")
diff --git a/ui/build/build.go b/ui/build/build.go
index 6874ef7..14d23a7 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -114,15 +114,12 @@
if config.bazelProdMode {
count++
}
- if config.bazelDevMode {
- count++
- }
if config.bazelStagingMode {
count++
}
if count > 1 {
ctx.Fatalln("Conflicting bazel mode.\n" +
- "Do not specify more than one of --bazel-mode and --bazel-mode-dev and --bazel-mode-staging ")
+ "Do not specify more than one of --bazel-mode and --bazel-mode-staging ")
}
}
diff --git a/ui/build/config.go b/ui/build/config.go
index c991777..523887a 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -111,7 +111,6 @@
pathReplaced bool
bazelProdMode bool
- bazelDevMode bool
bazelStagingMode bool
// Set by multiproduct_kati
@@ -853,8 +852,6 @@
c.multitreeBuild = true
} else if arg == "--bazel-mode" {
c.bazelProdMode = true
- } else if arg == "--bazel-mode-dev" {
- c.bazelDevMode = true
} else if arg == "--bazel-mode-staging" {
c.bazelStagingMode = true
} else if arg == "--search-api-dir" {
@@ -960,7 +957,7 @@
c.arguments = append(c.arguments, arg)
}
}
- if (!c.bazelProdMode) && (!c.bazelDevMode) && (!c.bazelStagingMode) {
+ if (!c.bazelProdMode) && (!c.bazelStagingMode) {
c.bazelProdMode = defaultBazelProdMode(c)
}
}
@@ -1385,7 +1382,7 @@
}
func (c *configImpl) BazelBuildEnabled() bool {
- return c.bazelProdMode || c.bazelDevMode || c.bazelStagingMode
+ return c.bazelProdMode || c.bazelStagingMode
}
func (c *configImpl) StartRBE() bool {
diff --git a/ui/build/config_test.go b/ui/build/config_test.go
index a1eccf0..545f727 100644
--- a/ui/build/config_test.go
+++ b/ui/build/config_test.go
@@ -1018,7 +1018,6 @@
environ Environment
arguments []string
useBazel bool
- bazelDevMode bool
bazelProdMode bool
bazelStagingMode bool
expectedBuildConfig *smpb.BuildConfig
@@ -1097,19 +1096,6 @@
},
},
{
- name: "bazel mixed build from dev mode",
- environ: Environment{},
- bazelDevMode: true,
- expectedBuildConfig: &smpb.BuildConfig{
- ForceUseGoma: proto.Bool(false),
- UseGoma: proto.Bool(false),
- UseRbe: proto.Bool(false),
- BazelMixedBuild: proto.Bool(true),
- ForceDisableBazelMixedBuild: proto.Bool(false),
- NinjaWeightListSource: smpb.BuildConfig_NOT_USED.Enum(),
- },
- },
- {
name: "bazel mixed build from prod mode",
environ: Environment{},
bazelProdMode: true,
@@ -1158,8 +1144,8 @@
"USE_RBE=1",
"BUILD_BROKEN_DISABLE_BAZEL=1",
},
- useBazel: true,
- bazelDevMode: true,
+ useBazel: true,
+ bazelProdMode: true,
expectedBuildConfig: &smpb.BuildConfig{
ForceUseGoma: proto.Bool(true),
UseGoma: proto.Bool(true),
@@ -1176,7 +1162,6 @@
t.Run(tc.name, func(t *testing.T) {
c := &configImpl{
environ: &tc.environ,
- bazelDevMode: tc.bazelDevMode,
bazelProdMode: tc.bazelProdMode,
bazelStagingMode: tc.bazelStagingMode,
arguments: tc.arguments,
diff --git a/ui/build/soong.go b/ui/build/soong.go
index b14208e..59a3242 100644
--- a/ui/build/soong.go
+++ b/ui/build/soong.go
@@ -272,9 +272,6 @@
if config.bazelProdMode {
mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--bazel-mode")
}
- if config.bazelDevMode {
- mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--bazel-mode-dev")
- }
if config.bazelStagingMode {
mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--bazel-mode-staging")
}