diff options
| author | mikecase <mikecase@chromium.org> | 2015-09-25 12:19:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-25 19:22:16 +0000 |
| commit | bf3dc38d551c62f884eaaed5452fb3a94a4f25f9 (patch) | |
| tree | 09ba354b045b3aada9ec7f66a50781120ea3d7c4 /third_party/errorprone/errorprone.gyp | |
| parent | a9576610c2d86860afd8a331197285a73b0ee7ac (diff) | |
| download | chromium_src-bf3dc38d551c62f884eaaed5452fb3a94a4f25f9.zip chromium_src-bf3dc38d551c62f884eaaed5452fb3a94a4f25f9.tar.gz chromium_src-bf3dc38d551c62f884eaaed5452fb3a94a4f25f9.tar.bz2 | |
Update errorprone to 2.0.5 and make it work with jdk7 and 8.
The bots have jdk7 and dev machines have jdk8. One of the jars in
jdk is a dependency for errorprone. Older versions require don't work
with jdk8 and newer versions require jdk8. To get around this, I am
updating errorprone to the latest release and also just adding the
required jar, javac-1.9.0-dev-r2644-1.jar, to the errorprone/lib/
folder.
BUG=
Review URL: https://codereview.chromium.org/1354783003
Cr-Commit-Position: refs/heads/master@{#350881}
Diffstat (limited to 'third_party/errorprone/errorprone.gyp')
| -rw-r--r-- | third_party/errorprone/errorprone.gyp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/third_party/errorprone/errorprone.gyp b/third_party/errorprone/errorprone.gyp index 90235fe..0378dde 100644 --- a/third_party/errorprone/errorprone.gyp +++ b/third_party/errorprone/errorprone.gyp @@ -12,7 +12,7 @@ 'target_name': 'error_prone_annotation_jar', 'type': 'none', 'variables': { - 'jar_path': 'lib/error_prone_annotation-2.0.1.jar', + 'jar_path': 'lib/error_prone_annotation-2.0.5.jar', }, 'includes': [ '../../build/host_prebuilt_jar.gypi', @@ -23,29 +23,29 @@ 'target_name': 'error_prone_annotations_jar', 'type': 'none', 'variables': { - 'jar_path': 'lib/error_prone_annotations-2.0.1.jar', + 'jar_path': 'lib/error_prone_annotations-2.0.5.jar', }, 'includes': [ '../../build/host_prebuilt_jar.gypi', ] }, { - # GN: //third_party/errorprone:javacutil_java - 'target_name': 'javacutil_jar', + # GN: //third_party/errorprone:dataflow_java + 'target_name': 'dataflow_jar', 'type': 'none', 'variables': { - 'jar_path': 'lib/javacutil-1.8.10.jar', + 'jar_path': 'lib/dataflow-1.8.10.jar', }, 'includes': [ '../../build/host_prebuilt_jar.gypi', ] }, { - # GN: //third_party/errorprone:dataflow_java - 'target_name': 'dataflow_jar', + # GN: //third_party/errorprone:javac_java + 'target_name': 'javac_jar', 'type': 'none', 'variables': { - 'jar_path': 'lib/dataflow-1.8.10.jar', + 'jar_path': 'lib/javac-1.9.0-dev-r2644-1.jar', }, 'includes': [ '../../build/host_prebuilt_jar.gypi', @@ -56,15 +56,14 @@ 'target_name': 'chromium_errorprone', 'type': 'none', 'variables': { - 'jar_path': 'lib/error_prone_core-2.0.1.jar', + 'jar_path': 'lib/error_prone_core-2.0.5.jar', }, 'dependencies': [ - '../../build/android/setup.gyp:sun_tools_java', '../../third_party/findbugs/findbugs.gyp:format_string_jar', 'error_prone_annotation_jar', 'error_prone_annotations_jar', - 'javacutil_jar', 'dataflow_jar', + 'javac_jar', ], 'includes': [ '../../build/host_prebuilt_jar.gypi', |