Add javax_annotations for robolectric 4.3

BUG: 965286
Change-Id: I61c48daea3dba4b0a12e0dc0727981b80da30174
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1967877
Commit-Queue: benjamin joyce <bjoyce@google.com>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Conley Owens <cco3@google.com>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728325}

DEPS

@@ -3187,6 +3187,17 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/javax_annotation_javax_annotation_api': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api',
+              'version': 'version:1.3.2-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
   'src/third_party/android_deps/libs/javax_annotation_jsr250_api': {
       'packages': [
           {

third_party/android_deps/BUILD.gn

@@ -1172,6 +1172,13 @@ java_prebuilt("com_squareup_javapoet_java") {
   enable_bytecode_rewriter = false
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+java_prebuilt("javax_annotation_javax_annotation_api_java") {
+  jar_path = "libs/javax_annotation_javax_annotation_api/javax.annotation-api-1.3.2.jar"
+  output_name = "javax_annotation_javax_annotation_api"
+  supports_android = true
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("javax_annotation_jsr250_api_java") {
   jar_path = "libs/javax_annotation_jsr250_api/jsr250-api-1.0.jar"

third_party/android_deps/additional_readme_paths.json

@@ -145,6 +145,7 @@
     "libs/com_google_protobuf_protobuf_lite",
     "libs/com_googlecode_java_diff_utils_diffutils",
     "libs/com_squareup_javapoet",
+    "libs/javax_annotation_javax_annotation_api",
     "libs/javax_annotation_jsr250_api",
     "libs/javax_inject_javax_inject",
     "libs/net_sf_kxml_kxml2",

third_party/android_deps/libs/javax_annotation_javax_annotation_api/OWNERS

+file://third_party/android_deps/OWNERS
\ No newline at end of file

third_party/android_deps/libs/javax_annotation_javax_annotation_api/README.chromium

+Name: Javax Annotation API
+Short Name: javax.annotation-api
+URL: http://jcp.org/en/jsr/detail?id=250
+Version: 1.3.2
+License: CDDLv1.1
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Common Annotations for the JavaTM Platform API
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/javax_annotation_javax_annotation_api/cipd.yaml

+# Copyright 2018 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# To create CIPD package run the following command.
+# cipd create --pkg-def cipd.yaml -tag version:1.3.2-cr0
+package: chromium/third_party/android_deps/libs/javax_annotation_javax_annotation_api
+description: "${extension.name} API"
+data:
+- file: javax.annotation-api-1.3.2.jar

tools/android/roll/android_deps/build.gradle

@@ -117,6 +117,7 @@ dependencies {
 
     compile "com.google.guava:listenablefuture:1.0"
     compile "com.google.protobuf:protobuf-lite:3.0.1"
+    compile "javax.annotation:javax.annotation-api:1.3.2"
     compile "javax.annotation:jsr250-api:1.0"
     compile "javax.inject:javax.inject:1"
 

tools/android/roll/android_deps/buildSrc/src/main/groovy/ChromiumDepGraph.groovy

@@ -74,6 +74,10 @@ class ChromiumDepGraph {
             url: "https://github.com/google-ar/arcore-android-sdk",
             licenseUrl: "https://raw.githubusercontent.com/google-ar/arcore-android-sdk/master/LICENSE",
             licenseName: "Apache 2.0"),
+        'javax_annotation_javax_annotation_api': new PropertyOverride(
+            isShipped: false,  // Annotations are stripped by R8.
+            licenseName: "CDDLv1.1",
+            licensePath: "licenses/CDDLv1.1.txt"),
         'javax_annotation_jsr250_api': new PropertyOverride(
             isShipped: false,  // Annotations are stripped by R8.
             licenseName: "CDDLv1.0",