Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: third_party/errorprone/BUILD.gn

Issue 1286613002: Update errorprone to fix java 8 issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed jbudorick's nits. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/java_apk.gypi ('k') | third_party/errorprone/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/errorprone/BUILD.gn
diff --git a/third_party/errorprone/BUILD.gn b/third_party/errorprone/BUILD.gn
index bb73af4df5b2cc3c038de901e7c76d034a76ef8d..62689ed99a62b9f597b60a5c1df89a990417aca6 100644
--- a/third_party/errorprone/BUILD.gn
+++ b/third_party/errorprone/BUILD.gn
@@ -4,19 +4,36 @@
import("//build/config/android/rules.gni")
-# GYP: //third_party/errorprone.gyp:errorprone_java
-java_prebuilt("errorprone_java") {
- jar_path = "lib/error_prone_core-1.1.2.jar"
+# GYP: //third_party/errorprone/errorprone.gyp:error_prone_annotation_jar
+java_prebuilt("error_prone_annotation_java") {
+ jar_path = "lib/error_prone_annotation-2.0.1.jar"
}
-# GYP: //third_party/errorprone.gyp:chromium_errorprone
-java_binary("chromium_errorprone") {
- chromium_code = false
- main_class = "org.chromium.errorprone.ChromiumErrorProneCompiler"
- enable_errorprone = false
- java_files = [ "src/org/chromium/errorprone/ChromiumErrorProneCompiler.java" ]
+# GYP: //third_party/errorprone/errorprone.gyp:error_prone_annotations_jar
+java_prebuilt("error_prone_annotations_java") {
+ jar_path = "lib/error_prone_annotations-2.0.1.jar"
+}
+
+# GYP: //third_party/errorprone/errorprone.gyp:javacutil_jar
+java_prebuilt("javacutil_java") {
+ jar_path = "lib/javacutil-1.8.10.jar"
+}
+
+# GYP: //third_party/errorprone/errorprone.gyp:dataflow_jar
+java_prebuilt("dataflow_java") {
+ jar_path = "lib/dataflow-1.8.10.jar"
+}
+
+# GYP: //third_party/errorprone/errorprone.gyp:chromium_errorprone
+java_prebuilt("chromium_errorprone") {
+ jar_path = "lib/error_prone_core-2.0.1.jar"
deps = [
+ ":dataflow_java",
+ ":error_prone_annotation_java",
+ ":error_prone_annotations_java",
+ ":javacutil_java",
"//build/android:sun_tools_java",
- ":errorprone_java",
+ "//third_party/findbugs:format_string_java",
]
+ main_class = "com.google.errorprone.ErrorProneCompiler"
}
« no previous file with comments | « build/java_apk.gypi ('k') | third_party/errorprone/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698