Merge "Soong: Update for explicit warning change"

1 files changed, 11 insertions, 6 deletions

diff --git a/java/config/error_prone.go b/java/config/error_prone.go
index f2032342b..2c1c002ba 100644
--- a/java/config/error_prone.go
+++ b/java/config/error_prone.go
@@ -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}")
 
 }