[Android] Fix to add javacutil jar as build dep to errorprone.

BUG=569547 Review URL: https://codereview.chromium.org/1525223002 Cr-Commit-Position: refs/heads/master@{#365851}
Denger-Network · Dec 17, 2015 · efb18a9 · efb18a9
1 parent 08fbbc6
commit efb18a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/third_party/errorprone/BUILD.gn b/third_party/errorprone/BUILD.gn
@@ -24,6 +24,11 @@ java_prebuilt("dataflow_java") {
   jar_path = "lib/dataflow-1.8.10.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:chromium_errorprone
 java_prebuilt("chromium_errorprone") {
   jar_path = "lib/error_prone_core-2.0.5.jar"
@@ -32,6 +37,7 @@ java_prebuilt("chromium_errorprone") {
     ":error_prone_annotation_java",
     ":error_prone_annotations_java",
     ":javac_java",
+    ":javacutil_java",
     "//third_party/findbugs:format_string_java",
   ]
   main_class = "com.google.errorprone.ErrorProneCompiler"

diff --git a/third_party/errorprone/errorprone.gyp b/third_party/errorprone/errorprone.gyp
@@ -40,6 +40,17 @@
         '../../build/host_prebuilt_jar.gypi',
       ]
     },
+    {
+      # GN: //third_party/errorprone:javacutil_java
+      'target_name': 'javacutil_jar',
+      'type': 'none',
+      'variables': {
+        'jar_path': 'lib/javacutil-1.8.10.jar',
+      },
+      'includes': [
+        '../../build/host_prebuilt_jar.gypi',
+      ]
+    },
     {
       # GN: //third_party/errorprone:javac_java
       'target_name': 'javac_jar',
@@ -64,6 +75,7 @@
         'error_prone_annotations_jar',
         'dataflow_jar',
         'javac_jar',
+        'javacutil_jar',
       ],
       'includes': [
         '../../build/host_prebuilt_jar.gypi',