Add --bazel-mode and --bazel-mode-dev
This allows "bazel mixed builds prod mode", in additional to reworking
the mechanism in which mixed builds dev mode is enabled.
As a followup, CI scripts will be migrated to use the new flags, as
USE_BAZEL_ANALYSIS=1 is deprecated.
Test: Manually ran --bazel-mode with an allowlist verifying that the
module alone was enabled
Test: Manually verified --bazel-mode and --bazel-mode-dev cause a build
failure
Change-Id: If0d34360e60452f428b05828f4ec7596b7cb619a
diff --git a/android/config.go b/android/config.go
index 5ca9420..222b142 100644
--- a/android/config.go
+++ b/android/config.go
@@ -96,7 +96,6 @@
// Use bazel during analysis of build modules from an allowlist carefully
// curated by the build team to be proven stable.
- // TODO(cparsons): Implement this mode.
BazelProdMode
)
@@ -481,14 +480,6 @@
config.AndroidFirstDeviceTarget = FirstTarget(config.Targets[Android], "lib64", "lib32")[0]
}
- // Checking USE_BAZEL_ANALYSIS must be done here instead of in the caller, so
- // that we can invoke IsEnvTrue (which also registers the env var as a
- // dependency of the build).
- // TODO(cparsons): Remove this hack once USE_BAZEL_ANALYSIS is removed.
- if buildMode == AnalysisNoBazel && config.IsEnvTrue("USE_BAZEL_ANALYSIS") {
- buildMode = BazelDevMode
- }
-
config.BuildMode = buildMode
config.BazelContext, err = NewBazelContext(config)
config.bp2buildPackageConfig = GetBp2BuildAllowList()
@@ -678,9 +669,7 @@
// DeviceProduct returns the current product target. There could be multiple of
// these per device type.
//
-// NOTE: Do not base conditional logic on this value. It may break product
-//
-// inheritance.
+// NOTE: Do not base conditional logic on this value. It may break product inheritance.
func (c *config) DeviceProduct() string {
return *c.productVariables.DeviceProduct
}