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

Merge "Remove USE_BAZEL_ANALYSIS" am: 1f039780e0 am: ad9c9a2d38

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2201557

Change-Id: I84f19f2f1f0492b4a2a8b654bcd3e7bcfba210a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Parsons 2022-09-07 23:00:38 +00:00 committed by Automerger Merge Worker
commit db095347bb
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{},