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

Commit f3e5b558 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Soong: support Errorprone javacflags 

Add support for an errorprone block in Java modules that accepts
additional javacflags for the errorprone build.

Sample:

    errorprone: {
        javacflags: ["-Xep:EqualsNaN:WARN"],
    },

Bug: 72004718
Test: m RUN_ERROR_PRONE=true
Test: manual - add block with ERROR to a project
Test: androidmk_test
Change-Id: I502248fe76c26aa19102f413af72a7324c35b7f4
parent 312ccb97

androidmk/cmd/androidmk/android.go

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ func init() { 


			"LOCAL_JAVA_RESOURCE_DIRS":    "java_resource_dirs",

			"LOCAL_JAVACFLAGS":            "javacflags",

			"LOCAL_ERROR_PRONE_FLAGS":     "errorprone.javacflags",

			"LOCAL_DX_FLAGS":              "dxflags",

			"LOCAL_JAVA_LIBRARIES":        "libs",

			"LOCAL_STATIC_JAVA_LIBRARIES": "static_libs",

androidmk/cmd/androidmk/androidmk_test.go

+18 −0
Original line number Diff line number Diff line
@@ -474,6 +474,24 @@ include $(call all-makefiles-under,$(LOCAL_PATH)) 
			}

		`,

	},

	{

		desc: "errorprone options for java library",

		in: `

			include $(CLEAR_VARS)

			LOCAL_ERROR_PRONE_FLAGS := -Xep:AsyncCallableReturnsNull:ERROR -Xep:AsyncFunctionReturnsNull:ERROR

			include $(BUILD_JAVA_LIBRARY)

		`,

		expected: `

			java_library {

				errorprone: {

					javacflags: [

						"-Xep:AsyncCallableReturnsNull:ERROR",

						"-Xep:AsyncFunctionReturnsNull:ERROR",

					],

				},

			}

		`,

	},

}



func reformatBlueprint(input string) string {

java/builder.go

+10 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ type javaBuilderFlags struct { 
	aidlFlags     string

	javaVersion   string



	errorProneExtraJavacFlags string



	kotlincFlags     string

	kotlincClasspath classpath
@@ -210,6 +212,14 @@ func RunErrorProne(ctx android.ModuleContext, outputFile android.WritablePath, 
		ctx.ModuleErrorf("cannot build with Error Prone, missing external/error_prone?")

	}



	if len(flags.errorProneExtraJavacFlags) > 0 {

		if len(flags.javacFlags) > 0 {

			flags.javacFlags = flags.errorProneExtraJavacFlags + " " + flags.javacFlags

		} else {

			flags.javacFlags = flags.errorProneExtraJavacFlags

		}

	}



	transformJavaToClasses(ctx, outputFile, -1, srcFiles, srcJars, flags, nil,

		"errorprone", "errorprone", errorprone)

}

java/java.go

+9 −0
Original line number Diff line number Diff line
@@ -142,6 +142,11 @@ type CompilerProperties struct { 
		Exclude_filter []string

	}



	Errorprone struct {

		// List of javac flags that should only be used when running errorprone.

		Javacflags []string

	}



	Proto struct {

		// List of extra options that will be passed to the proto generator.

		Output_params []string
@@ -646,6 +651,10 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB 
		flags.javacFlags = "$javacFlags"

	}



	if len(j.properties.Errorprone.Javacflags) > 0 {

		flags.errorProneExtraJavacFlags = strings.Join(j.properties.Errorprone.Javacflags, " ")

	}



	// javaVersion flag.

	sdk := sdkStringToNumber(ctx, String(j.deviceProperties.Sdk_version))

	if j.properties.Java_version != nil {