diff options
| author | Colin Cross <ccross@android.com> | 2017-08-28 17:23:21 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-08-28 19:27:36 -0700 |
| commit | 3203dde60be8b6e2329a3801247fe0aa8c898904 (patch) | |
| tree | a9f03c2ddb5c997be23ee9e055d5a2b34c93d549 /java/config | |
| parent | 77d9decf755cab69f2fec61dead5689e09bba66b (diff) | |
| download | build_soong-3203dde60be8b6e2329a3801247fe0aa8c898904.tar.gz build_soong-3203dde60be8b6e2329a3801247fe0aa8c898904.tar.bz2 build_soong-3203dde60be8b6e2329a3801247fe0aa8c898904.zip | |
Pass javac flags to errorprone builds
Pass CommonJdkFlags to errorprone builds, which is required for
frameworks/base/layoutlib/create to work correctly. Unfortunately,
javac and errorprone cannot use the same syntax for the heap size,
javac needs -J-Xmx and errorprone needs -Xmx, so split the heap size
flag out into a separate variable.
Test: m -j RUN_ERROR_PRONE=true javac-check
Change-Id: Icd7f8cf627534fb089ec83e462c060572dd2d20c
Diffstat (limited to 'java/config')
| -rw-r--r-- | java/config/config.go | 5 | ||||
| -rw-r--r-- | java/config/errorprone.go | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/java/config/config.go b/java/config/config.go index 90d0fb51..c6c8fffd 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -26,14 +26,17 @@ import ( var ( pctx = android.NewPackageContext("android/soong/java/config") + JavacHeapSize = "2048M" + DefaultLibraries = []string{"core-oj", "core-libart", "ext", "framework", "okhttp"} ) func init() { pctx.Import("github.com/google/blueprint/bootstrap") + pctx.StaticVariable("JavacHeapFlags", "-J-Xmx"+JavacHeapSize) + pctx.StaticVariable("CommonJdkFlags", strings.Join([]string{ - `-J-Xmx2048M`, `-Xmaxerrs 9999999`, `-encoding UTF-8`, `-sourcepath ""`, diff --git a/java/config/errorprone.go b/java/config/errorprone.go index da9b7753..ddb9902e 100644 --- a/java/config/errorprone.go +++ b/java/config/errorprone.go @@ -78,6 +78,8 @@ func init() { "-Xep:UnusedAnonymousClass:ERROR", }, " ")) + pctx.StaticVariable("ErrorProneHeapFlags", "-Xmx"+JavacHeapSize) + pctx.StaticVariable("ErrorProneFlags", strings.Join([]string{ "com.google.errorprone.ErrorProneCompiler", "-Xdiags:verbose", @@ -87,11 +89,12 @@ func init() { "-XDuseStrictMethodClashCheck=true", "-XDuseStructuralMostSpecificResolution=true", "-XDuseGraphInference=true", - "-Xmaxwarns 100000", "-XDandroidCompatible=true", "-XepAllErrorsAsWarnings", }, " ")) pctx.StaticVariable("ErrorProneCmd", - "${JavaCmd} -Xbootclasspath/p:${ErrorProneJavacJar} -cp ${ErrorProneJar}:${ErrorProneClasspath} ${ErrorProneFlags} ${ErrorProneChecksError}") + "${JavaCmd} ${ErrorProneHeapFlags} -Xbootclasspath/p:${ErrorProneJavacJar} "+ + "-cp ${ErrorProneJar}:${ErrorProneClasspath} "+ + "${ErrorProneFlags} ${CommonJdkFlags} ${ErrorProneChecksError}") } |