From 19ab9a455f5d88f3a37de9c82428801f490d6e66 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Tue, 30 Aug 2022 13:15:04 -0400 Subject: [PATCH] Remove USE_BAZEL and its dead code This environment variable has been out of use for some time. It used to control Bazel-as-executor, which has been removed from Bazel for several releases. Bug: 243077098 Test: Treehugger Change-Id: I4edfb5f3574c369a16547ea06ba780293c37ecb3 --- cmd/soong_ui/main.go | 4 ---- ui/build/build.go | 10 +++------- ui/build/config.go | 33 +-------------------------------- ui/build/config_test.go | 11 ----------- 4 files changed, 4 insertions(+), 54 deletions(-) diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index cb8563488..b06e4fe73 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -176,10 +176,6 @@ func main() { build.SetupOutDir(buildCtx, config) - if config.UseBazel() && config.Dist() { - defer populateExternalDistDir(buildCtx, config) - } - // Set up files to be outputted in the log directory. logsDir := config.LogsDir() diff --git a/ui/build/build.go b/ui/build/build.go index c61baa135..ecf11ccd6 100644 --- a/ui/build/build.go +++ b/ui/build/build.go @@ -104,10 +104,9 @@ const ( // Whether to run ninja on the combined ninja. RunNinja = 1 << iota // Whether to run bazel on the combined ninja. - RunBazel = 1 << iota - RunBuildTests = 1 << iota - RunAll = RunProductConfig | RunSoong | RunKati | RunKatiNinja | RunNinja - RunAllWithBazel = RunProductConfig | RunSoong | RunKati | RunKatiNinja | RunBazel + RunBazel = 1 << iota + RunBuildTests = 1 << iota + RunAll = RunProductConfig | RunSoong | RunKati | RunKatiNinja | RunNinja ) // checkBazelMode fails the build if there are conflicting arguments for which bazel @@ -256,9 +255,6 @@ func Build(ctx Context, config Config) { SetupPath(ctx, config) what := RunAll - if config.UseBazel() { - what = RunAllWithBazel - } if config.Checkbuild() { what |= RunBuildTests } diff --git a/ui/build/config.go b/ui/build/config.go index 590aeb9be..14a99d080 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -99,15 +99,9 @@ type configImpl struct { pathReplaced bool - // TODO(b/243077098): Remove useBazel. - useBazel bool bazelProdMode bool bazelDevMode bool - // During Bazel execution, Bazel cannot write outside OUT_DIR. - // So if DIST_DIR is set to an external dir (outside of OUT_DIR), we need to rig it temporarily and then migrate files at the end of the build. - riggedDistDirForBazel string - // Set by multiproduct_kati emptyNinjaFile bool @@ -439,21 +433,6 @@ func NewConfig(ctx Context, args ...string) Config { ctx.Fatalf("Unable to remove bazel profile directory %q: %v", bpd, err) } - ret.useBazel = ret.environ.IsEnvTrue("USE_BAZEL") - - if ret.UseBazel() { - if err := os.MkdirAll(bpd, 0777); err != nil { - ctx.Fatalf("Failed to create bazel profile directory %q: %v", bpd, err) - } - } - - if ret.UseBazel() { - ret.riggedDistDirForBazel = filepath.Join(ret.OutDir(), "dist") - } else { - // Not rigged - ret.riggedDistDirForBazel = ret.distDir - } - c := Config{ret} storeConfigMetrics(ctx, c) return c @@ -486,7 +465,6 @@ func buildConfig(config Config) *smpb.BuildConfig { ForceUseGoma: proto.Bool(config.ForceUseGoma()), UseGoma: proto.Bool(config.UseGoma()), UseRbe: proto.Bool(config.UseRBE()), - BazelAsNinja: proto.Bool(config.UseBazel()), BazelMixedBuild: proto.Bool(config.BazelBuildEnabled()), } c.Targets = append(c.Targets, config.arguments...) @@ -877,11 +855,7 @@ func (c *configImpl) OutDir() string { } func (c *configImpl) DistDir() string { - if c.UseBazel() { - return c.riggedDistDirForBazel - } else { - return c.distDir - } + return c.distDir } func (c *configImpl) RealDistDir() string { @@ -1129,11 +1103,6 @@ func (c *configImpl) UseRBE() bool { return false } -// TODO(b/243077098): Remove UseBazel. -func (c *configImpl) UseBazel() bool { - return c.useBazel -} - func (c *configImpl) BazelBuildEnabled() bool { return c.bazelProdMode || c.bazelDevMode } diff --git a/ui/build/config_test.go b/ui/build/config_test.go index 63716b0f7..2887f59a6 100644 --- a/ui/build/config_test.go +++ b/ui/build/config_test.go @@ -1017,7 +1017,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(false), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(false), BazelMixedBuild: proto.Bool(false), }, }, @@ -1028,7 +1027,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(true), UseGoma: proto.Bool(false), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(false), BazelMixedBuild: proto.Bool(false), }, }, @@ -1039,7 +1037,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(true), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(false), BazelMixedBuild: proto.Bool(false), }, }, @@ -1050,7 +1047,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(false), UseRbe: proto.Bool(true), - BazelAsNinja: proto.Bool(false), BazelMixedBuild: proto.Bool(false), }, }, @@ -1062,7 +1058,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(false), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(true), BazelMixedBuild: proto.Bool(false), }, }, @@ -1073,7 +1068,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(false), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(false), BazelMixedBuild: proto.Bool(true), }, }, @@ -1085,7 +1079,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(false), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(false), BazelMixedBuild: proto.Bool(true), }, }, @@ -1097,7 +1090,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(false), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(false), BazelMixedBuild: proto.Bool(true), }, }, @@ -1110,7 +1102,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(false), UseGoma: proto.Bool(false), UseRbe: proto.Bool(false), - BazelAsNinja: proto.Bool(true), BazelMixedBuild: proto.Bool(false), Targets: []string{"droid", "dist"}, }, @@ -1128,7 +1119,6 @@ func TestBuildConfig(t *testing.T) { ForceUseGoma: proto.Bool(true), UseGoma: proto.Bool(true), UseRbe: proto.Bool(true), - BazelAsNinja: proto.Bool(true), BazelMixedBuild: proto.Bool(true), }, }, @@ -1139,7 +1129,6 @@ func TestBuildConfig(t *testing.T) { t.Run(tc.name, func(t *testing.T) { c := &configImpl{ environ: &tc.environ, - useBazel: tc.useBazel, bazelDevMode: tc.bazelDevMode, bazelProdMode: tc.bazelProdMode, arguments: tc.arguments,