Reland of move android_support_annotations target. (patchset chromium#1…

… id:1 of https://codereview.chromium.org/2132033002/ )

Reason for revert:
Attempting to fix cronet build issues.

Original issue's description:
> Revert of Remove android_support_annotations target. (patchset chromium#2 id:20001 of https://codereview.chromium.org/2137433002/ )
>
> Reason for revert:
> Broke the tree
>
> Original issue's description:
> > Remove android_support_annotations target.
> >
> > android-support-annotations.jar and android-support-v13.jar both define android.support.annotations. Since we use both, this can produce errors building when we try to use android.support.annotations in a new target (eg com.android.dex.DexException: Multiple dex files define Landroid/support/annotation/AnimRes).
> >
> > android-support-annotations.jar contains a subset of android-support-v13.jar, so I am removing it and updating all dependencies to point to the latter.
> >
> > BUG=623012
> >
> > Committed: https://crrev.com/dd8383aa3af51d5c067e445c1390dc9eadc6a220
> > Cr-Commit-Position: refs/heads/master@{#404371}
>
> TBR=jochen@chromium.org,bauerb@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=623012
>
> Committed: https://crrev.com/2ccd50c3c7f17e770e511096af7d62e36f13135e
> Cr-Commit-Position: refs/heads/master@{#404390}

TBR=jochen@chromium.org,bauerb@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=623012

Review-Url: https://codereview.chromium.org/2140543002
Cr-Commit-Position: refs/heads/master@{#404656}

build/secondary/third_party/android_tools/BUILD.gn

@@ -56,10 +56,6 @@ android_java_prebuilt("android_support_design_java") {
   jar_path = "$android_sdk_root/extras/android/support/design/libs/android-support-design.jar"
 }
 
-android_java_prebuilt("android_support_annotations_javalib") {
-  jar_path = "$android_sdk_root/extras/android/support/annotations/android-support-annotations.jar"
-}
-
 java_prebuilt("android_support_multidex_java") {
   supports_android = true
   jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/android-support-multidex.jar"

components/cronet.gypi

@@ -250,7 +250,7 @@
             'cronet_version',
             'load_states_list',
             'network_quality_observation_source_java',
-            '../third_party/android_tools/android_tools.gyp:android_support_annotations_javalib',
+            '../third_party/android_tools/android_tools.gyp:android_support_v13_java',
           ],
           'variables': {
             'java_in_dir': 'cronet/android/api',
@@ -269,7 +269,7 @@
             'libcronet',
             'net_request_priority_java',
             'network_quality_observation_source_java',
-            '../third_party/android_tools/android_tools.gyp:android_support_annotations_javalib',
+            '../third_party/android_tools/android_tools.gyp:android_support_v13_java',
           ],
           'variables': {
             'java_in_dir': 'cronet/android/java',

components/cronet/android/BUILD.gn

@@ -274,7 +274,7 @@ android_library("cronet_api") {
   ]
 
   deps = [
-    "//third_party/android_tools:android_support_annotations_javalib",
+    "//third_party/android_tools:android_support_v13_java",
   ]
 
   srcjar_deps = [
@@ -313,7 +313,7 @@ android_library("cronet_java") {
     ":cronet_api",
     "//base:base_java",
     "//net/android:net_java",
-    "//third_party/android_tools:android_support_annotations_javalib",
+    "//third_party/android_tools:android_support_v13_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
 

components/cronet/android/proguard.cfg

@@ -45,4 +45,6 @@
 # is never used directly by native code. Since the class is not loaded, it does
 # not need to be preserved as an entry point.
 -dontnote org.chromium.net.UrlRequest$ResponseHeadersMap
+# https://android.googlesource.com/platform/sdk/+/marshmallow-mr1-release/files/proguard-android.txt#54
+-dontwarn android.support.**
 

third_party/android_async_task/BUILD.gn

@@ -10,7 +10,7 @@ android_library("android_async_task_java") {
   java_files = [ "java/src/org/chromium/third_party/android/os/AsyncTask.java" ]
   deps = [
     "//base:base_java",
-    "//third_party/android_tools:android_support_annotations_javalib",
+    "//third_party/android_tools:android_support_v13_java",
   ]
   chromium_code = false
 }

third_party/android_async_task/README.chromium

@@ -11,4 +11,4 @@ This contains a copy of Android sdk 23's AsyncTask.java.
 Local Modifications:
 - Renamed package to org.chromium.third_party.android.os.
 - Explicitly import android.os objects.
-- Switch to using android.support.annotations.
+- Switch to using android.support.annotations (from android.support.v13).

third_party/espresso/BUILD.gn

@@ -16,7 +16,7 @@ android_java_prebuilt("espresso_contrib_java") {
 android_java_prebuilt("espresso_core_java") {
   jar_path = "lib/espresso-core-2.2-release-no-dep.jar"
   deps = [
-    "//third_party/android_tools:android_support_annotations_javalib",
+    "//third_party/android_tools:android_support_v13_java",
     "//third_party/guava:guava_java",
     "//third_party/hamcrest:hamcrest_core_java",
     "//third_party/javax_inject:javax_inject_java",