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

Commit 58614c04 authored by Sam Delmerico's avatar Sam Delmerico
Browse files

support errorprone javacflags 

Soong has a separate property specifically for errorprone javacflags
that we need to add to the Bazel javacopts.

Test: go test ./bp2build
Change-Id: I5299f45793d2b05a6a71b94dd17ceb797f407846
parent 76ff96f8

bp2build/java_library_conversion_test.go

+63 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ func runJavaLibraryTestCaseWithRegistrationCtxFunc(t *testing.T, tc bp2buildTest 
}



func runJavaLibraryTestCase(t *testing.T, tc bp2buildTestCase) {

	t.Helper()

	runJavaLibraryTestCaseWithRegistrationCtxFunc(t, tc, func(ctx android.RegistrationContext) {})

}
@@ -156,3 +157,65 @@ java_plugin { 
		ctx.RegisterModuleType("java_plugin", java.PluginFactory)

	})

}



func TestJavaLibraryErrorproneJavacflagsEnabledManually(t *testing.T) {

	runJavaLibraryTestCase(t, bp2buildTestCase{

		blueprint: `java_library {

    name: "java-lib-1",

    srcs: ["a.java"],

    javacflags: ["-Xsuper-fast"],

    errorprone: {

        enabled: true,

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

    },

}`,

		expectedBazelTargets: []string{

			makeBazelTarget("java_library", "java-lib-1", attrNameToString{

				"javacopts": `[

        "-Xsuper-fast",

        "-Xep:SpeedLimit:OFF",

    ]`,

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

			}),

		},

	})

}



func TestJavaLibraryErrorproneJavacflagsErrorproneDisabledByDefault(t *testing.T) {

	runJavaLibraryTestCase(t, bp2buildTestCase{

		blueprint: `java_library {

    name: "java-lib-1",

    srcs: ["a.java"],

    javacflags: ["-Xsuper-fast"],

    errorprone: {

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

    },

}`,

		expectedBazelTargets: []string{

			makeBazelTarget("java_library", "java-lib-1", attrNameToString{

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

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

			}),

		},

	})

}



func TestJavaLibraryErrorproneJavacflagsErrorproneDisabledManually(t *testing.T) {

	runJavaLibraryTestCase(t, bp2buildTestCase{

		blueprint: `java_library {

    name: "java-lib-1",

    srcs: ["a.java"],

    javacflags: ["-Xsuper-fast"],

    errorprone: {

		enabled: false,

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

    },

}`,

		expectedBazelTargets: []string{

			makeBazelTarget("java_library", "java-lib-1", attrNameToString{

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

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

			}),

		},

	})

}

java/java.go

+11 −4
Original line number Diff line number Diff line
@@ -2060,15 +2060,22 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) 
		protoSrcPartition: android.ProtoSrcLabelPartition,

	})



	var javacopts []string

	if m.properties.Javacflags != nil {

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

	}

	epEnabled := m.properties.Errorprone.Enabled

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

	if Bool(epEnabled) {

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

	}



	commonAttrs := &javaCommonAttributes{

		Srcs: srcPartitions[javaSrcPartition],

		Plugins: bazel.MakeLabelListAttribute(

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

		),

	}



	if m.properties.Javacflags != nil {

		commonAttrs.Javacopts = bazel.MakeStringListAttribute(m.properties.Javacflags)

		Javacopts: bazel.MakeStringListAttribute(javacopts),

	}



	depLabels := &javaDependencyLabels{}