tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove USE_BAZEL_ANALYSIS

Browse source 
Use --bazel-mode-dev instead.

Test: Treehugger
Bug: 244309479
Change-Id: I570d02651eea92375cd96efbeb8d986a9495e1ed
This commit is contained in:
Chris Parsons 2022-08-30 13:37:57 -04:00
parent cedd4117a8
commit 1bb58da17c
3 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/bazel.go
View file

@ -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
}

11
ui/build/build.go
View file

@ -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")
}
}

10
ui/build/config_test.go
View file

@ -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{},