Merge "Remove USE_BAZEL_ANALYSIS" (1f039780) · Commits · e / os / android_build_soong

android/bazel.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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
		}

+3 −8

Original line number	Diff line number	Diff line
		@@ -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")
		}
		}

+0 −10

Original line number	Diff line number	Diff line
		@@ -1061,16 +1061,6 @@ func TestBuildConfig(t *testing.T) {
		BazelMixedBuild: proto.Bool(false),
		},
		},
		{
		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{},