StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Soong: Update for explicit warning change"

Browse Source
This commit is contained in:
Treehugger Robot
2018-06-07 19:55:54 +00:00
committed by Gerrit Code Review
parent 8d29e1e024 05f08543d3
commit 8a9f5da905
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/config/error_prone.go
View File

@@ -18,11 +18,13 @@ import "android/soong/android"
var ( var (
// These will be filled out by external/error_prone/soong/error_prone.go if it is available // These will be filled out by external/error_prone/soong/error_prone.go if it is available
ErrorProneJavacJar string ErrorProneJavacJar string
ErrorProneJar string ErrorProneJar string
ErrorProneClasspath string ErrorProneClasspath string
ErrorProneChecksError string ErrorProneChecksError string
ErrorProneFlags 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 // 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("ErrorProneJavacJar", &ErrorProneJavacJar)
errorProneVar("ErrorProneClasspath", &ErrorProneClasspath) errorProneVar("ErrorProneClasspath", &ErrorProneClasspath)
errorProneVar("ErrorProneChecksError", &ErrorProneChecksError) errorProneVar("ErrorProneChecksError", &ErrorProneChecksError)
errorProneVar("ErrorProneChecksWarning", &ErrorProneChecksWarning)
errorProneVar("ErrorProneChecksDefaultDisabled", &ErrorProneChecksDefaultDisabled)
errorProneVar("ErrorProneFlags", &ErrorProneFlags) errorProneVar("ErrorProneFlags", &ErrorProneFlags)
pctx.StaticVariable("ErrorProneCmd", pctx.StaticVariable("ErrorProneCmd",
"${JavaCmd} -Xmx${JavacHeapSize} -Xbootclasspath/p:${ErrorProneJavacJar} "+ "${JavaCmd} -Xmx${JavacHeapSize} -Xbootclasspath/p:${ErrorProneJavacJar} "+
"-cp ${ErrorProneJar}:${ErrorProneClasspath} "+ "-cp ${ErrorProneJar}:${ErrorProneClasspath} "+
"${ErrorProneFlags} ${CommonJdkFlags} ${ErrorProneChecksError}") "${ErrorProneFlags} ${CommonJdkFlags} "+
"${ErrorProneChecksError} ${ErrorProneChecksWarning} ${ErrorProneChecksDefaultDisabled}")
} }