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

Commit 24de8d76 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Soong: Update for explicit warning change" 

am: 8a9f5da9

Change-Id: Iff1c59f43fde8dc421006d6a6d492b97032a159c
parents 2090540f 8a9f5da9

java/config/error_prone.go

+11 −6
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ var ( 
	ErrorProneJar                   string

	ErrorProneClasspath             string

	ErrorProneChecksError           string

	ErrorProneChecksWarning         string

	ErrorProneChecksDefaultDisabled string

	ErrorProneFlags                 string

)
@@ -37,11 +39,14 @@ func init() { 
	errorProneVar("ErrorProneJavacJar", &ErrorProneJavacJar)

	errorProneVar("ErrorProneClasspath", &ErrorProneClasspath)

	errorProneVar("ErrorProneChecksError", &ErrorProneChecksError)

	errorProneVar("ErrorProneChecksWarning", &ErrorProneChecksWarning)

	errorProneVar("ErrorProneChecksDefaultDisabled", &ErrorProneChecksDefaultDisabled)

	errorProneVar("ErrorProneFlags", &ErrorProneFlags)



	pctx.StaticVariable("ErrorProneCmd",

		"${JavaCmd} -Xmx${JavacHeapSize} -Xbootclasspath/p:${ErrorProneJavacJar} "+

			"-cp ${ErrorProneJar}:${ErrorProneClasspath} "+

			"${ErrorProneFlags} ${CommonJdkFlags} ${ErrorProneChecksError}")

			"${ErrorProneFlags} ${CommonJdkFlags} "+

			"${ErrorProneChecksError} ${ErrorProneChecksWarning} ${ErrorProneChecksDefaultDisabled}")



}