Soong: Update for explicit warning change

Add ErrorProneChecksWarning.

Bug: 72971960
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I92169ed4aa8e7dc52b84ddb005cd07e2bf6dcbe2
This commit is contained in:
Andreas Gampe
2018-06-01 15:44:26 -07:00
parent 1d2318d6cd
commit 05f08543d3

View File

@@ -18,11 +18,13 @@ import "android/soong/android"
var (
// These will be filled out by external/error_prone/soong/error_prone.go if it is available
ErrorProneJavacJar string
ErrorProneJar string
ErrorProneClasspath string
ErrorProneChecksError string
ErrorProneFlags string
ErrorProneJavacJar string
ErrorProneJar string
ErrorProneClasspath string
ErrorProneChecksError string
ErrorProneChecksWarning string
ErrorProneChecksDefaultDisabled string
ErrorProneFlags string
)
// Wrapper that grabs value of val late so it can be initialized by a later module's init function
@@ -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}")
}