[Android Build] Add extra exported android_deps

This CL adds exported deps for:
- org.checkerframework:checker-compat-qual
- org.codehaus.mojo:animal-sniffer-annotations

This is in preparation to switching to the maven version of guava in
order to avoid conflicts with the internal version of guava.

BUG=1144019

Change-Id: I4a2c49445f0ae389d508b7bcaac3da9b88935c11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527262Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826336}

third_party/android_deps/BUILD.gn

@@ -1658,6 +1658,23 @@ java_prebuilt("org_ccil_cowan_tagsoup_tagsoup_java") {
   testonly = true
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("org_checkerframework_checker_compat_qual_java") {
+  jar_path = "libs/org_checkerframework_checker_compat_qual/checker-compat-qual-2.5.3.jar"
+  output_name = "org_checkerframework_checker_compat_qual"
+  supports_android = true
+}
+
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("org_codehaus_mojo_animal_sniffer_annotations_java") {
+  jar_path = "libs/org_codehaus_mojo_animal_sniffer_annotations/animal-sniffer-annotations-1.17.jar"
+  output_name = "org_codehaus_mojo_animal_sniffer_annotations"
+  supports_android = true
+
+  # Needed to break dependency cycle for errorprone_plugin_java.
+  enable_bytecode_checks = false
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_ow2_asm_asm_java") {
   jar_path = "libs/org_ow2_asm_asm/asm-7.0.jar"
@@ -2822,17 +2839,6 @@ java_prebuilt("org_apache_maven_wagon_wagon_provider_api_java") {
   deps = [ ":org_codehaus_plexus_plexus_utils_java" ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("org_checkerframework_checker_compat_qual_java") {
-  jar_path = "libs/org_checkerframework_checker_compat_qual/checker-compat-qual-2.5.3.jar"
-  output_name = "org_checkerframework_checker_compat_qual"
-  enable_bytecode_checks = false
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [ ":*" ]
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_checkerframework_checker_qual_java") {
   jar_path = "libs/org_checkerframework_checker_qual/checker-qual-2.10.0.jar"
@@ -2856,17 +2862,6 @@ java_prebuilt("org_checkerframework_dataflow_shaded_java") {
   visibility = [ ":*" ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-java_prebuilt("org_codehaus_mojo_animal_sniffer_annotations_java") {
-  jar_path = "libs/org_codehaus_mojo_animal_sniffer_annotations/animal-sniffer-annotations-1.17.jar"
-  output_name = "org_codehaus_mojo_animal_sniffer_annotations"
-  enable_bytecode_checks = false
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [ ":*" ]
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("org_codehaus_plexus_plexus_container_default_java") {
   jar_path = "libs/org_codehaus_plexus_plexus_container_default/plexus-container-default-1.0-alpha-9-stable-1.jar"

third_party/android_deps/build.gradle

@@ -184,6 +184,9 @@ dependencies {
     def errorproneVersion = '2.4.0'
     // Used by downstream targets.
     compile "com.google.errorprone:error_prone_annotations:${errorproneVersion}"
+    compile "org.checkerframework:checker-compat-qual:2.5.3"
+    compile "org.codehaus.mojo:animal-sniffer-annotations:1.17"
+
     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}"

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

@@ -461,6 +461,7 @@ class BuildConfigGenerator extends DefaultTask {
             case 'com_google_j2objc_j2objc_annotations':
             case 'com_google_guava_listenablefuture':
             case 'com_googlecode_java_diff_utils_diffutils':
+            case 'org_codehaus_mojo_animal_sniffer_annotations':
                 sb.append('\n')
                 sb.append('  # Needed to break dependency cycle for errorprone_plugin_java.\n')
                 sb.append('  enable_bytecode_checks = false\n')

third_party/android_deps/libs/org_checkerframework_checker_compat_qual/README.chromium

@@ -3,8 +3,8 @@ Short Name: checker-compat-qual
 URL: https://checkerframework.org
 Version: 2.5.3
 License: GPL v2 with the classpath exception
-License File: NOT_SHIPPED
-Security Critical: no
+License File: LICENSE
+Security Critical: yes
 
 Description:
 Checker Qual is the set of annotations (qualifiers) and supporting classes used by the Checker Framework to type check Java source code. Please see artifact: org.checkerframework:checker

third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/README.chromium

@@ -3,8 +3,8 @@ Short Name: animal-sniffer-annotations
 URL: http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/
 Version: 1.17
 License: MIT
-License File: NOT_SHIPPED
-Security Critical: no
+License File: LICENSE
+Security Critical: yes
 
 Description: