Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a7529b0 authored by Romain Jobredeaux's avatar Romain Jobredeaux
Browse files

Log whether user explicitly disabled mixed builds in Soong metrics. 

Test: unit tests
Bug: 254649740
Change-Id: I2d4080955e10fe4b50e335c97c79dddbdd22c170
parent 2ff53da9

ui/build/config.go

+9 −4
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ func buildConfig(config Config) *smpb.BuildConfig { 
		UseGoma:                     proto.Bool(config.UseGoma()),

		UseRbe:                      proto.Bool(config.UseRBE()),

		BazelMixedBuild:             proto.Bool(config.BazelBuildEnabled()),

		ForceDisableBazelMixedBuild: proto.Bool(config.IsBazelMixedBuildForceDisabled()),

	}

	c.Targets = append(c.Targets, config.arguments...)
@@ -1452,6 +1453,10 @@ func (c *configImpl) EmptyNinjaFile() bool { 
	return c.emptyNinjaFile

}



func (c *configImpl) IsBazelMixedBuildForceDisabled() bool {

	return c.Environment().IsEnvTrue("BUILD_BROKEN_DISABLE_BAZEL")

}



func GetMetricsUploader(topDir string, env *Environment) string {

	if p, ok := env.Get("METRICS_UPLOADER"); ok {

		metricsUploader := filepath.Join(topDir, p)

ui/build/config_test.go

+64 −41
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import ( 
	"android/soong/ui/logger"

	smpb "android/soong/ui/metrics/metrics_proto"

	"android/soong/ui/status"



	"google.golang.org/protobuf/encoding/prototext"



	"google.golang.org/protobuf/proto"
@@ -1019,6 +1020,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1029,6 +1031,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1039,6 +1042,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(true),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1049,6 +1053,18 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(true),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{

			name:    "disable mixed builds",

			environ: Environment{"BUILD_BROKEN_DISABLE_BAZEL=1"},

			expectedBuildConfig: &smpb.BuildConfig{

				ForceUseGoma:                proto.Bool(false),

				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(true),

			},

		},

		{
@@ -1060,6 +1076,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1071,6 +1088,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1082,6 +1100,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1093,6 +1112,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(false),

				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1106,6 +1126,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				Targets:                     []string{"droid", "dist"},

				ForceDisableBazelMixedBuild: proto.Bool(false),

			},

		},

		{
@@ -1114,6 +1135,7 @@ func TestBuildConfig(t *testing.T) { 
				"FORCE_USE_GOMA=1",

				"USE_GOMA=1",

				"USE_RBE=1",

				"BUILD_BROKEN_DISABLE_BAZEL=1",

			},

			useBazel:     true,

			bazelDevMode: true,
@@ -1122,6 +1144,7 @@ func TestBuildConfig(t *testing.T) { 
				UseGoma:                     proto.Bool(true),

				UseRbe:                      proto.Bool(true),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(true),

			},

		},

	}