diff options
| -rw-r--r-- | android/bazel.go | 2 | ||||
| -rw-r--r-- | ui/build/build.go | 11 | ||||
| -rw-r--r-- | ui/build/config_test.go | 10 |
3 files changed, 4 insertions, 19 deletions
diff --git a/android/bazel.go b/android/bazel.go index 27ec92bd1..eb6aca4e9 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -75,7 +75,7 @@ type bazelModuleProperties struct { // Properties contains common module properties for Bazel migration purposes. type properties struct { - // In USE_BAZEL_ANALYSIS=1 mode, this represents the Bazel target replacing + // In "Bazel mixed build" mode, this represents the Bazel target replacing // this Soong module. Bazel_module bazelModuleProperties } diff --git a/ui/build/build.go b/ui/build/build.go index ecf11ccd6..ff2d5f28d 100644 --- a/ui/build/build.go +++ b/ui/build/build.go @@ -112,17 +112,12 @@ const ( // checkBazelMode fails the build if there are conflicting arguments for which bazel // build mode to use. func checkBazelMode(ctx Context, config Config) { - // TODO(cparsons): Remove USE_BAZEL_ANALYSIS handling. if config.Environment().IsEnvTrue("USE_BAZEL_ANALYSIS") { - if config.bazelProdMode || config.bazelDevMode { - ctx.Fatalf("USE_BAZEL_ANALYSIS is deprecated.\n" + - "Unset USE_BAZEL_ANALYSIS when using --bazel-mode or --bazel-mode-dev.") - } else { - config.bazelDevMode = true - } + ctx.Fatalln("USE_BAZEL_ANALYSIS is deprecated. Unset USE_BAZEL_ANALYSIS.\n" + + "Use --bazel-mode-dev instead. For example: `m --bazel-mode-dev nothing`") } if config.bazelProdMode && config.bazelDevMode { - ctx.Fatalf("Conflicting bazel mode.\n" + + ctx.Fatalln("Conflicting bazel mode.\n" + "Do not specify both --bazel-mode and --bazel-mode-dev") } } diff --git a/ui/build/config_test.go b/ui/build/config_test.go index 2887f59a6..150ec35dc 100644 --- a/ui/build/config_test.go +++ b/ui/build/config_test.go @@ -1062,16 +1062,6 @@ func TestBuildConfig(t *testing.T) { }, }, { - name: "bazel mixed build from env", - environ: Environment{"USE_BAZEL_ANALYSIS=1"}, - expectedBuildConfig: &smpb.BuildConfig{ - ForceUseGoma: proto.Bool(false), - UseGoma: proto.Bool(false), - UseRbe: proto.Bool(false), - BazelMixedBuild: proto.Bool(true), - }, - }, - { name: "bazel mixed build from dev mode", environ: Environment{}, bazelDevMode: true, |