android_deps: Making error prone annotations support android

Change-Id: I1285b1d76184bec795025a4157a5770275a8300f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523438
Commit-Queue: Sam Maier <smaier@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825068}

third_party/android_deps/BUILD.gn

@@ -1463,6 +1463,9 @@ java_prebuilt("com_google_errorprone_error_prone_annotation_java") {
 java_prebuilt("com_google_errorprone_error_prone_annotations_java") {
   jar_path = "libs/com_google_errorprone_error_prone_annotations/error_prone_annotations-2.4.0.jar"
   output_name = "com_google_errorprone_error_prone_annotations"
+  supports_android = true
+
+  # Needed to break dependency cycle for errorprone_plugin_java.
   enable_bytecode_checks = false
 }
 

third_party/android_deps/build.gradle

@@ -182,10 +182,11 @@ dependencies {
     buildCompile "com.squareup:javapoet:1.11.0"
 
     def errorproneVersion = '2.4.0'
+    // Used by downstream targets.
+    compile "com.google.errorprone:error_prone_annotations:${errorproneVersion}"
     buildCompile "com.google.errorprone:error_prone_core:${errorproneVersion}"
     buildCompile "com.google.errorprone:error_prone_check_api:${errorproneVersion}"
     buildCompile "com.google.errorprone:error_prone_annotation:${errorproneVersion}"
-    buildCompile "com.google.errorprone:error_prone_annotations:${errorproneVersion}"
     buildCompile "com.google.errorprone:javac:9+181-r4173-1"
 
     buildCompile "com.google.auto.service:auto-service:1.0-rc6"

third_party/android_deps/buildSrc/src/main/groovy/BuildConfigGenerator.groovy

@@ -456,6 +456,7 @@ class BuildConfigGenerator extends DefaultTask {
                 sb.append('  jar_excluded_patterns = ["*/ListenableFuture.class"]\n')
                 break
             case 'com_google_code_findbugs_jsr305':
+            case 'com_google_errorprone_error_prone_annotations':
             case 'com_google_guava_failureaccess':
             case 'com_google_j2objc_j2objc_annotations':
             case 'com_google_guava_listenablefuture':

third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/README.chromium

@@ -3,8 +3,8 @@ Short Name: error_prone_annotations
 URL: https://errorprone.info/
 Version: 2.4.0
 License: Apache 2.0
-License File: NOT_SHIPPED
-Security Critical: no
+License File: LICENSE
+Security Critical: yes
 
 Description: