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

Commit 2a779ea8 authored by Alix Espino's avatar Alix Espino Committed by Gerrit Code Review
Browse files

Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main 

* changes:
  Bp2build for errorprone modules that manually enabled/disabled it
  Make errorprone a configurable attribute for bazel conversion
parents 90d8f551 b1e5c6a6

bazel/configurability.go

+24 −7
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ const ( 


	InApex  = "in_apex"

	NonApex = "non_apex"



	ErrorproneDisabled = "errorprone_disabled"

)



func PowerSetWithoutEmptySet[T any](items []T) [][]T {
@@ -216,6 +218,11 @@ var ( 
		NonApex:                    "//build/bazel/rules/apex:non_apex",

		ConditionsDefaultConfigKey: ConditionsDefaultSelectKey,

	}



	errorProneMap = map[string]string{

		ErrorproneDisabled:         "//build/bazel/rules/java/errorprone:errorprone_globally_disabled",

		ConditionsDefaultConfigKey: ConditionsDefaultSelectKey,

	}

)



// basic configuration types
@@ -229,6 +236,7 @@ const ( 
	productVariables

	osAndInApex

	inApex

	errorProneDisabled

)



func osArchString(os string, arch string) string {
@@ -244,6 +252,7 @@ func (ct configurationType) String() string { 
		productVariables:   "product_variables",

		osAndInApex:        "os_in_apex",

		inApex:             "in_apex",

		errorProneDisabled: "errorprone_disabled",

	}[ct]

}
@@ -274,6 +283,10 @@ func (ct configurationType) validateConfig(config string) { 
		if _, ok := inApexMap[config]; !ok {

			panic(fmt.Errorf("Unknown in_apex config: %s", config))

		}

	case errorProneDisabled:

		if _, ok := errorProneMap[config]; !ok {

			panic(fmt.Errorf("Unknown errorprone config: %s", config))

		}

	default:

		panic(fmt.Errorf("Unrecognized ConfigurationType %d", ct))

	}
@@ -303,6 +316,8 @@ func (ca ConfigurationAxis) SelectKey(config string) string { 
		return config

	case inApex:

		return inApexMap[config]

	case errorProneDisabled:

		return errorProneMap[config]

	default:

		panic(fmt.Errorf("Unrecognized ConfigurationType %d", ca.configurationType))

	}
@@ -321,6 +336,8 @@ var ( 
	OsAndInApexAxis = ConfigurationAxis{configurationType: osAndInApex}

	// An axis for in_apex-specific configurations

	InApexAxis = ConfigurationAxis{configurationType: inApex}



	ErrorProneAxis = ConfigurationAxis{configurationType: errorProneDisabled}

)



// ProductVariableConfigurationAxis returns an axis for the given product variable

bazel/properties.go

+4 −4
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ func (lla *LabelListAttribute) SetSelectValue(axis ConfigurationAxis, config str 
	switch axis.configurationType {

	case noConfig:

		lla.Value = list

	case arch, os, osArch, productVariables, osAndInApex, inApex:

	case arch, os, osArch, productVariables, osAndInApex, inApex, errorProneDisabled:

		if lla.ConfigurableValues == nil {

			lla.ConfigurableValues = make(configurableLabelLists)

		}
@@ -782,7 +782,7 @@ func (lla *LabelListAttribute) SelectValue(axis ConfigurationAxis, config string 
	switch axis.configurationType {

	case noConfig:

		return lla.Value

	case arch, os, osArch, productVariables, osAndInApex, inApex:

	case arch, os, osArch, productVariables, osAndInApex, inApex, errorProneDisabled:

		return lla.ConfigurableValues[axis][config]

	default:

		panic(fmt.Errorf("Unrecognized ConfigurationAxis %s", axis))
@@ -1346,7 +1346,7 @@ func (sla *StringListAttribute) SetSelectValue(axis ConfigurationAxis, config st 
	switch axis.configurationType {

	case noConfig:

		sla.Value = list

	case arch, os, osArch, productVariables, osAndInApex:

	case arch, os, osArch, productVariables, osAndInApex, errorProneDisabled:

		if sla.ConfigurableValues == nil {

			sla.ConfigurableValues = make(configurableStringLists)

		}
@@ -1362,7 +1362,7 @@ func (sla *StringListAttribute) SelectValue(axis ConfigurationAxis, config strin 
	switch axis.configurationType {

	case noConfig:

		return sla.Value

	case arch, os, osArch, productVariables, osAndInApex:

	case arch, os, osArch, productVariables, osAndInApex, errorProneDisabled:

		return sla.ConfigurableValues[axis][config]

	default:

		panic(fmt.Errorf("Unrecognized ConfigurationAxis %s", axis))

bp2build/java_library_conversion_test.go

+20 −8
Original line number Diff line number Diff line
@@ -183,8 +183,8 @@ func TestJavaLibraryJavaVersion(t *testing.T) { 
	})

}



func TestJavaLibraryErrorproneJavacflagsEnabledManually(t *testing.T) {

	runJavaLibraryTestCase(t, Bp2buildTestCase{

func TestJavaLibraryErrorproneEnabledManually(t *testing.T) {

	runJavaLibraryTestCaseWithRegistrationCtxFunc(t, Bp2buildTestCase{

		Blueprint: `java_library {

    name: "java-lib-1",

    srcs: ["a.java"],
@@ -192,7 +192,13 @@ func TestJavaLibraryErrorproneJavacflagsEnabledManually(t *testing.T) { 
    errorprone: {

        enabled: true,

        javacflags: ["-Xep:SpeedLimit:OFF"],

        extra_check_modules: ["plugin2"],

    },

}

java_plugin {

    name: "plugin2",

    srcs: ["a.java"],

    bazel_module: { bp2build_available: false },

}`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
@@ -200,10 +206,14 @@ func TestJavaLibraryErrorproneJavacflagsEnabledManually(t *testing.T) { 
        "-Xsuper-fast",

        "-Xep:SpeedLimit:OFF",

    ]`,

				"plugins":                 `[":plugin2"]`,

				"srcs":                    `["a.java"]`,

				"errorprone_force_enable": `True`,

			}),

			MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),

		},

	}, func(ctx android.RegistrationContext) {

		ctx.RegisterModuleType("java_plugin", java.PluginFactory)

	})

}
@@ -227,7 +237,7 @@ func TestJavaLibraryErrorproneJavacflagsErrorproneDisabledByDefault(t *testing.T 
	})

}



func TestJavaLibraryErrorproneJavacflagsErrorproneDisabledManually(t *testing.T) {

func TestJavaLibraryErrorproneDisabledManually(t *testing.T) {

	runJavaLibraryTestCase(t, Bp2buildTestCase{

		Blueprint: `java_library {

    name: "java-lib-1",
@@ -235,12 +245,14 @@ func TestJavaLibraryErrorproneJavacflagsErrorproneDisabledManually(t *testing.T) 
    javacflags: ["-Xsuper-fast"],

    errorprone: {

    enabled: false,

        javacflags: ["-Xep:SpeedLimit:OFF"],

    },

}`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{

				"javacopts": `["-Xsuper-fast"]`,

				"javacopts": `[

        "-Xsuper-fast",

        "-XepDisableAllChecks",

    ]`,

				"srcs": `["a.java"]`,

			}),

			MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),

java/java.go

+26 −16
Original line number Diff line number Diff line
@@ -2772,6 +2772,7 @@ type javaCommonAttributes struct { 
	Javacopts               bazel.StringListAttribute

	Sdk_version             bazel.StringAttribute

	Java_version            bazel.StringAttribute

	Errorprone_force_enable bazel.BoolAttribute

}



type javaDependencyLabels struct {
@@ -2913,26 +2914,35 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) 
		staticDeps.Add(&bazel.Label{Label: ":" + javaAidlLibName})

	}



	var javacopts []string

	var javacopts bazel.StringListAttribute //[]string

	plugins := bazel.MakeLabelListAttribute(

		android.BazelLabelForModuleDeps(ctx, m.properties.Plugins),

	)

	if m.properties.Javacflags != nil {

		javacopts = append(javacopts, m.properties.Javacflags...)

		javacopts = bazel.MakeStringListAttribute(m.properties.Javacflags)

	}



	epEnabled := m.properties.Errorprone.Enabled

	epJavacflags := m.properties.Errorprone.Javacflags

	var errorproneForceEnable bazel.BoolAttribute

	if epEnabled == nil {

		//TODO(b/227504307) add configuration that depends on RUN_ERROR_PRONE environment variable

	if Bool(epEnabled) {

		javacopts = append(javacopts, m.properties.Errorprone.Javacflags...)

	} else if *epEnabled {

		plugins.Append(bazel.MakeLabelListAttribute(android.BazelLabelForModuleDeps(ctx, m.properties.Errorprone.Extra_check_modules)))

		javacopts.Append(bazel.MakeStringListAttribute(epJavacflags))

		errorproneForceEnable.Value = epEnabled

	} else {

		javacopts.Append(bazel.MakeStringListAttribute([]string{"-XepDisableAllChecks"}))

	}



	commonAttrs := &javaCommonAttributes{

		Srcs:                    javaSrcs,

		javaResourcesAttributes: m.convertJavaResourcesAttributes(ctx),

		Plugins: bazel.MakeLabelListAttribute(

			android.BazelLabelForModuleDeps(ctx, m.properties.Plugins),

		),

		Javacopts:    bazel.MakeStringListAttribute(javacopts),

		Plugins:                 plugins,

		Javacopts:               javacopts,

		Java_version:            bazel.StringAttribute{Value: m.properties.Java_version},

		Sdk_version:             bazel.StringAttribute{Value: m.deviceProperties.Sdk_version},

		Errorprone_force_enable: errorproneForceEnable,

	}



	for axis, configToProps := range archVariantProps {