Introduce dagger 2

This is the resurrection of the CL by dgn@: https://chromium-review.googlesource.com/c/chromium/src/+/803975

What changed:
- Dagger updated from 2.13 to 2.17, along with corresponding updates of dependencies.
- A couple of changes in internal_rules.gni to get annotation processor and their dependencies added as targets.
- Added dagger-spi, which is a dependency of dagger since 2.14.
- Removed findbugs_jsr305, since it is already present in the project.
- Moved javax.inject into android_deps.

Bug: 787005
Change-Id: Ia64bdef606cbcbc6ca39fefa431b2434cc7b7263
Reviewed-on: https://chromium-review.googlesource.com/1183903Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Pavel Shmakov <pshmakov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585833}

DEPS

@@ -774,17 +774,6 @@ deps = {
       'dep_type': 'cipd',
   },
 
-  'src/third_party/javax_inject': {
-      'packages': [
-          {
-              'package': 'chromium/third_party/javax_inject',
-              'version': 'version:1-cr0',
-          },
-      ],
-      'condition': 'checkout_android',
-      'dep_type': 'cipd',
-  },
-
   'src/third_party/jsoncpp/source':
     Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248
 
@@ -1644,6 +1633,171 @@ deps = {
       'dep_type': 'cipd',
   },
 
+  'src/third_party/android_deps/libs/com_google_dagger_dagger': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_android': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_android_processor': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_processor',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_android_support': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_compiler': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_producers': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers',
+              'version': 'version:2.17-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_dagger_dagger_spi': {
+        'packages': [
+            {
+                'package': 'chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi',
+                'version': 'version:2.17-cr0',
+            },
+        ],
+        'condition': 'checkout_android',
+        'dep_type': 'cipd',
+    },
+
+  'src/third_party/android_deps/libs/com_google_errorprone_javac_shaded': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded',
+              'version': 'version:9-dev-r4023-3-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format',
+              'version': 'version:1.5-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_google_guava_guava': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava',
+              'version': 'version:25.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/com_squareup_javapoet': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/com_squareup_javapoet',
+              'version': 'version:1.11.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/javax_annotation_jsr250_api': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/android_deps/libs/javax_annotation_jsr250_api',
+              'version': 'version:1.0-cr0',
+          },
+      ],
+      'condition': 'checkout_android',
+      'dep_type': 'cipd',
+  },
+
+  'src/third_party/android_deps/libs/javax_inject_javax_inject': {
+        'packages': [
+            {
+                'package': 'chromium/third_party/android_deps/libs/javax_inject_javax_inject',
+                'version': 'version:1-cr0',
+            },
+        ],
+        'condition': 'checkout_android',
+        'dep_type': 'cipd',
+    },
+
   # === ANDROID_DEPS Generated Code End ===
 }
 

build/config/android/internal_rules.gni

@@ -2984,6 +2984,7 @@ if (enable_java_templates) {
     # TODO(agrieve): Enable lint for _has_sources rather than just _java_files.
     _lint_enabled = _java_files != [] && _supports_android && _chromium_code &&
                     !disable_android_lint
+
     if (_has_sources) {
       _compile_java_target = "${_main_target_name}__compile_java"
       compile_java(_compile_java_target) {
@@ -3175,11 +3176,15 @@ if (enable_java_templates) {
         deps = _accumulated_public_deps
       }
       _accumulated_public_deps += [ ":${target_name}__java_binary_script" ]
+    }
 
+    if (_is_java_binary ||
+        (_is_annotation_processor && !defined(_final_jar_path))) {
       group(target_name) {
         forward_variables_from(invoker,
                                [
                                  "data",
+                                 "deps",
                                  "data_deps",
                                  "visibility",
                                ])

chrome/android/BUILD.gn

@@ -273,6 +273,9 @@ android_library("chrome_java") {
     "//services/shape_detection/public/mojom:mojom_java",
     "//skia/public/interfaces:interfaces_java",
     "//third_party/android_data_chart:android_data_chart_java",
+    "//third_party/android_deps:com_google_dagger_dagger_android_java",
+    "//third_party/android_deps:com_google_dagger_dagger_java",
+    "//third_party/android_deps:javax_inject_javax_inject_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
@@ -365,6 +368,11 @@ android_library("chrome_java") {
   # Add the actual implementation where necessary so that downstream targets
   # can provide their own implementations.
   jar_excluded_patterns = [ "*/AppHooksImpl.class" ]
+
+  annotation_processor_deps = [
+    "//third_party/android_deps:dagger_processor",
+    "//third_party/android_deps:dagger_android_processor",
+  ]
 }
 
 action("chrome_android_java_google_api_keys_srcjar") {

third_party/android_deps/BUILD.gn

@@ -133,6 +133,21 @@ java_group("android_support_v17_preference_java") {
   ]
 }
 
+# Annotation processors for Dagger2.
+java_annotation_processor("dagger_processor") {
+  main_class = "dagger.internal.codegen.ComponentProcessor"
+  deps = [
+    ":com_google_dagger_dagger_compiler_java",
+  ]
+}
+
+java_annotation_processor("dagger_android_processor") {
+  main_class = "dagger.android.processor.AndroidProcessor"
+  deps = [
+    ":com_google_dagger_dagger_android_processor_java",
+  ]
+}
+
 # The section below is generated by running
 # `//tools/android/roll/android_deps/fetch_all.sh`
 
@@ -458,6 +473,66 @@ android_aar_prebuilt("com_google_android_play_core_java") {
       "libs/com_google_android_play_core/com_google_android_play_core.info"
 }
 
+java_prebuilt("com_google_dagger_dagger_java") {
+  jar_path = "libs/com_google_dagger_dagger/dagger-2.17.jar"
+  output_name = "com_google_dagger_dagger"
+  supports_android = true
+  deps = [
+    ":javax_inject_javax_inject_java",
+  ]
+}
+
+android_aar_prebuilt("com_google_dagger_dagger_android_java") {
+  aar_path = "libs/com_google_dagger_dagger_android/dagger-android-2.17.aar"
+  info_path = "libs/com_google_dagger_dagger_android/com_google_dagger_dagger_android.info"
+  deps = [
+    ":com_android_support_support_annotations_java",
+    ":com_google_dagger_dagger_java",
+    ":javax_inject_javax_inject_java",
+  ]
+}
+
+java_prebuilt("com_google_dagger_dagger_android_processor_java") {
+  jar_path = "libs/com_google_dagger_dagger_android_processor/dagger-android-processor-2.17.jar"
+  output_name = "com_google_dagger_dagger_android_processor"
+  deps = [
+    ":com_google_dagger_dagger_android_jarimpl_java",
+    ":com_google_dagger_dagger_android_support_jarimpl_java",
+    ":com_google_dagger_dagger_java",
+    ":com_google_googlejavaformat_google_java_format_java",
+    ":com_google_guava_guava_java",
+    ":com_squareup_javapoet_java",
+  ]
+}
+
+android_aar_prebuilt("com_google_dagger_dagger_android_support_java") {
+  aar_path = "libs/com_google_dagger_dagger_android_support/dagger-android-support-2.17.aar"
+  info_path = "libs/com_google_dagger_dagger_android_support/com_google_dagger_dagger_android_support.info"
+  deps = [
+    ":com_android_support_appcompat_v7_java",
+    ":com_android_support_support_annotations_java",
+    ":com_android_support_support_fragment_java",
+    ":com_google_dagger_dagger_android_java",
+    ":com_google_dagger_dagger_java",
+    ":javax_inject_javax_inject_java",
+  ]
+}
+
+java_prebuilt("com_google_dagger_dagger_compiler_java") {
+  jar_path = "libs/com_google_dagger_dagger_compiler/dagger-compiler-2.17.jar"
+  output_name = "com_google_dagger_dagger_compiler"
+  deps = [
+    ":com_google_dagger_dagger_java",
+    ":com_google_dagger_dagger_producers_java",
+    ":com_google_dagger_dagger_spi_java",
+    ":com_google_googlejavaformat_google_java_format_java",
+    ":com_google_guava_guava_java",
+    ":com_squareup_javapoet_java",
+    ":javax_annotation_jsr250_api_java",
+    ":javax_inject_javax_inject_java",
+  ]
+}
+
 java_prebuilt("android_arch_core_common_java") {
   jar_path = "libs/android_arch_core_common/common-1.0.0.jar"
   output_name = "android_arch_core_common"
@@ -622,4 +697,80 @@ android_aar_prebuilt("com_google_android_gms_play_services_stats_java") {
     ":com_google_android_gms_play_services_basement_java",
   ]
 }
+
+java_prebuilt("com_google_dagger_dagger_android_jarimpl_java") {
+  jar_path = "libs/com_google_dagger_dagger_android_jarimpl/dagger-android-jarimpl-2.17.jar"
+  output_name = "com_google_dagger_dagger_android_jarimpl"
+  visibility = [ ":*" ]
+}
+
+java_prebuilt("com_google_dagger_dagger_android_support_jarimpl_java") {
+  jar_path = "libs/com_google_dagger_dagger_android_support_jarimpl/dagger-android-support-jarimpl-2.17.jar"
+  output_name = "com_google_dagger_dagger_android_support_jarimpl"
+  visibility = [ ":*" ]
+}
+
+java_prebuilt("com_google_dagger_dagger_producers_java") {
+  jar_path = "libs/com_google_dagger_dagger_producers/dagger-producers-2.17.jar"
+  output_name = "com_google_dagger_dagger_producers"
+  visibility = [ ":*" ]
+  deps = [
+    ":com_google_dagger_dagger_java",
+    ":com_google_guava_guava_java",
+    ":javax_inject_javax_inject_java",
+  ]
+}
+
+java_prebuilt("com_google_dagger_dagger_spi_java") {
+  jar_path = "libs/com_google_dagger_dagger_spi/dagger-spi-2.17.jar"
+  output_name = "com_google_dagger_dagger_spi"
+  visibility = [ ":*" ]
+  deps = [
+    ":com_google_dagger_dagger_java",
+    ":com_google_dagger_dagger_producers_java",
+    ":com_google_guava_guava_java",
+    ":javax_inject_javax_inject_java",
+  ]
+}
+
+java_prebuilt("com_google_errorprone_javac_shaded_java") {
+  jar_path =
+      "libs/com_google_errorprone_javac_shaded/javac-shaded-9-dev-r4023-3.jar"
+  output_name = "com_google_errorprone_javac_shaded"
+  visibility = [ ":*" ]
+}
+
+java_prebuilt("com_google_googlejavaformat_google_java_format_java") {
+  jar_path = "libs/com_google_googlejavaformat_google_java_format/google-java-format-1.5.jar"
+  output_name = "com_google_googlejavaformat_google_java_format"
+  visibility = [ ":*" ]
+  deps = [
+    ":com_google_errorprone_javac_shaded_java",
+    ":com_google_guava_guava_java",
+  ]
+}
+
+java_prebuilt("com_google_guava_guava_java") {
+  jar_path = "libs/com_google_guava_guava/guava-25.0.jar"
+  output_name = "com_google_guava_guava"
+  visibility = [ ":*" ]
+}
+
+java_prebuilt("com_squareup_javapoet_java") {
+  jar_path = "libs/com_squareup_javapoet/javapoet-1.11.0.jar"
+  output_name = "com_squareup_javapoet"
+  visibility = [ ":*" ]
+}
+
+java_prebuilt("javax_annotation_jsr250_api_java") {
+  jar_path = "libs/javax_annotation_jsr250_api/jsr250-api-1.0.jar"
+  output_name = "javax_annotation_jsr250_api"
+  visibility = [ ":*" ]
+}
+
+java_prebuilt("javax_inject_javax_inject_java") {
+  jar_path = "libs/javax_inject_javax_inject/javax.inject-1.jar"
+  output_name = "javax_inject_javax_inject"
+  supports_android = true
+}
 # === Generated Code End ===

third_party/android_deps/additional_readme_paths.json

@@ -45,5 +45,20 @@
     "libs/com_google_android_gms_play_services_tasks",
     "libs/com_google_android_gms_play_services_vision",
     "libs/com_google_android_gms_play_services_vision_common",
-    "libs/com_google_android_play_core"
+    "libs/com_google_android_play_core",
+    "libs/com_google_dagger_dagger",
+    "libs/com_google_dagger_dagger_android",
+    "libs/com_google_dagger_dagger_android_jarimpl",
+    "libs/com_google_dagger_dagger_android_processor",
+    "libs/com_google_dagger_dagger_android_support",
+    "libs/com_google_dagger_dagger_android_support_jarimpl",
+    "libs/com_google_dagger_dagger_compiler",
+    "libs/com_google_dagger_dagger_producers",
+    "libs/com_google_dagger_dagger_spi",
+    "libs/com_google_errorprone_javac_shaded",
+    "libs/com_google_googlejavaformat_google_java_format",
+    "libs/com_google_guava_guava",
+    "libs/com_squareup_javapoet",
+    "libs/javax_annotation_jsr250_api",
+    "libs/javax_inject_javax_inject"
 ]

third_party/android_deps/libs/com_google_dagger_dagger/README.chromium

+Name: Dagger
+Short Name: dagger
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: LICENSE
+Security Critical: yes
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/javax_inject/cipd.yaml → third_party/android_deps/libs/com_google_dagger_dagger/cipd.yaml

-# Copyright 2017 The Chromium Authors. All rights reserved.
+# 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:$(cat version.txt)
-package: chromium/third_party/javax_inject
-description: javax_inject Java library
+# cipd create --pkg-def cipd.yaml -tag version:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger
+description: Dagger
 data:
-  - file: lib/javax.inject.jar
+- file: dagger-2.17.jar

third_party/android_deps/libs/com_google_dagger_dagger_android/README.chromium

+Name: Dagger Android
+Short Name: dagger-android
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: LICENSE
+Security Critical: yes
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_android/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_android
+description: Dagger Android
+data:
+- file: dagger-android-2.17.aar
+- file: com_google_dagger_dagger_android.info

third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl/README.chromium

+Name: Dagger Android (Jar Impl)
+Short Name: dagger-android-jarimpl
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_jarimpl
+description: Dagger Android (Jar Impl)
+data:
+- file: dagger-android-jarimpl-2.17.jar

third_party/android_deps/libs/com_google_dagger_dagger_android_processor/README.chromium

+Name: Dagger Android Processor
+Short Name: dagger-android-processor
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_android_processor/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_processor
+description: Dagger Android Processor
+data:
+- file: dagger-android-processor-2.17.jar

third_party/android_deps/libs/com_google_dagger_dagger_android_support/README.chromium

+Name: Dagger Android Support
+Short Name: dagger-android-support
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: LICENSE
+Security Critical: yes
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_android_support/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support
+description: Dagger Android Support
+data:
+- file: dagger-android-support-2.17.aar
+- file: com_google_dagger_dagger_android_support.info

third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl/README.chromium

+Name: Dagger Android Support (Jar Impl)
+Short Name: dagger-android-support-jarimpl
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_android_support_jarimpl
+description: Dagger Android Support (Jar Impl)
+data:
+- file: dagger-android-support-jarimpl-2.17.jar

third_party/android_deps/libs/com_google_dagger_dagger_compiler/README.chromium

+Name: Dagger Compiler
+Short Name: dagger-compiler
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_compiler/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_compiler
+description: Dagger Compiler
+data:
+- file: dagger-compiler-2.17.jar

third_party/android_deps/libs/com_google_dagger_dagger_producers/README.chromium

+Name: Dagger Producers
+Short Name: dagger-producers
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_producers/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_producers
+description: Dagger Producers
+data:
+- file: dagger-producers-2.17.jar

third_party/android_deps/libs/com_google_dagger_dagger_spi/README.chromium

+Name: Dagger Spi
+Short Name: dagger-spi
+URL: https://github.com/google/dagger
+Version: 2.17
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A fast dependency injector for Android and Java.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_dagger_dagger_spi/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:2.13-cr0
+package: chromium/third_party/android_deps/libs/com_google_dagger_dagger_spi
+description: A fast dependency injector for Android and Java
+data:
+- file: dagger-spi-2.17.jar

third_party/android_deps/libs/com_google_errorprone_javac_shaded/README.chromium

+Name: Error Prone shaded javac
+Short Name: javac-shaded
+URL: https://github.com/google/error-prone-javac
+Version: 9-dev-r4023-3
+License: GNU General Public License, version 2, with the Classpath Exception
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A repackaged and shaded copy of javac
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_errorprone_javac_shaded/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:9-dev-r4023-3-cr0
+package: chromium/third_party/android_deps/libs/com_google_errorprone_javac_shaded
+description: Error Prone shaded javac
+data:
+- file: javac-shaded-9-dev-r4023-3.jar

third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/README.chromium

+Name: Google Java Format
+Short Name: google-java-format
+URL: https://github.com/google/google-java-format
+Version: 1.4
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+A Java source code formatter that follows Google Java Style.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_googlejavaformat_google_java_format/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.4-cr0
+package: chromium/third_party/android_deps/libs/com_google_googlejavaformat_google_java_format
+description: Google Java Format
+data:
+- file: google-java-format-1.5.jar

third_party/android_deps/libs/com_google_guava_guava/README.chromium

+Name: Guava: Google Core Libraries for Java
+Short Name: guava
+URL: https://github.com/google/guava
+Version: 25.0
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Guava is a suite of core and expanded libraries that include utility classes, google's collections, io classes, and much much more. Guava has only one code dependency - javax.annotation, per the JSR-305 spec.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_google_guava_guava/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:21.0-cr0
+package: chromium/third_party/android_deps/libs/com_google_guava_guava
+description: Guava, Google Core Libraries for Java
+data:
+- file: guava-25.0.jar

third_party/android_deps/libs/com_squareup_javapoet/README.chromium

+Name: JavaPoet
+Short Name: javapoet
+URL: http://github.com/square/javapoet/
+Version: 1.11.0
+License: Apache 2.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+Use beautiful Java code to generate beautiful Java code.
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/com_squareup_javapoet/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.8.0-cr0
+package: chromium/third_party/android_deps/libs/com_squareup_javapoet
+description: JavaPoet
+data:
+- file: javapoet-1.11.0.jar

third_party/android_deps/libs/javax_annotation_jsr250_api/README.chromium

+Name: JSR-250 Common Annotations for the JavaTM Platform
+Short Name: jsr250-api
+URL: http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html
+Version: 1.0
+License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+JSR-250 Reference Implementation by Glassfish
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/javax_annotation_jsr250_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.0-cr0
+package: chromium/third_party/android_deps/libs/javax_annotation_jsr250_api
+description: JSR-250 Common Annotations for the JavaTM Platform
+data:
+- file: jsr250-api-1.0.jar

third_party/android_deps/libs/javax_inject_javax_inject/README.chromium

+Name: javax.inject
+Short Name: javax.inject
+URL: http://code.google.com/p/atinject/
+Version: 1
+License: Apache Version 2.0
+License File: LICENSE
+Security Critical: yes
+
+Description:
+The javax.inject API
+
+Local Modifications:
+No modifications.

third_party/android_deps/libs/javax_inject_javax_inject/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-cr0
+package: chromium/third_party/android_deps/libs/javax_inject_javax_inject
+description: javax.inject
+data:
+- file: javax.inject-1.jar

third_party/espresso/BUILD.gn

@@ -29,10 +29,10 @@ android_java_prebuilt("espresso_core_java") {
   testonly = true
   jar_path = "lib/espresso-core-release-no-dep.jar"
   deps = [
+    "//third_party/android_deps:javax_inject_javax_inject_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/guava:guava_android_java",
     "//third_party/hamcrest:hamcrest_core_java",
-    "//third_party/javax_inject:javax_inject_java",
   ]
 }
 

third_party/javax_inject/BUILD.gn

-# Copyright 2016 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.
-
-import("//build/config/android/rules.gni")
-
-android_java_prebuilt("javax_inject_java") {
-  jar_path = "lib/javax.inject.jar"
-}

third_party/javax_inject/OWNERS

-jbudorick@chromium.org
-mikecase@chromium.org
-yolandyan@chromium.org

third_party/javax_inject/README.chromium

-Name: javax.inject
-Short Name: javax_inject
-URL: http://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html
-Version: 1
-License: Apache 2.0
-License File: NOT_SHIPPED
-Security Critical: no
-License Android Compatible: yes
-
-Description:
-This package specifies a means for obtaining objects in such a way as to
-maximize reusability, testability and maintainability compared to traditional
-approaches such as constructors, factories, and service locators (e.g., JNDI).
-This process, known as dependency injection, is beneficial to most nontrivial
-applications.
-IMPORTANT: There should only be one version of espresso library
-(crbug.com/622057)
-
-Local Modifications: None

tools/android/roll/android_deps/build.gradle

@@ -63,6 +63,16 @@ dependencies {
     compile "com.android.support:design:${supportLibVersion}"
 
     compile "com.android.support:multidex:1.0.0"
+
+    // Dagger
+    def daggerVersion = '2.17'
+    compile "com.google.dagger:dagger:${daggerVersion}"
+    compile "com.google.dagger:dagger-android:${daggerVersion}"
+    compile "com.google.dagger:dagger-android-support:${daggerVersion}"
+    compile "javax.inject:javax.inject:1"
+
+    annotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
+    annotationProcessor "com.google.dagger:dagger-android-processor:${daggerVersion}"
 }
 
 task setUpRepository(type: BuildConfigGenerator) {

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

@@ -20,6 +20,26 @@ import org.gradle.maven.MavenPomArtifact
 class ChromiumDepGraph {
     final def dependencies = new HashMap<String, DependencyDescription>()
 
+    // Some libraries don't properly fill their POM with the appropriate licensing information.
+    // It is provided here from manual lookups.
+    final def FALLBACK_PROPERTIES = [
+        'com_google_googlejavaformat_google_java_format': new DependencyDescription(
+          url: "https://github.com/google/google-java-format",
+          licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
+          licenseName: "Apache 2.0"),
+        'com_google_guava_guava': new DependencyDescription(
+          url: "https://github.com/google/guava",
+          licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
+          licenseName: "Apache 2.0"),
+        'org_codehaus_mojo_animal_sniffer_annotations': new DependencyDescription(
+          url: "http://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/",
+          licenseUrl: "https://opensource.org/licenses/mit-license.php",
+          licenseName: "MIT"),
+        'org_checkerframework_checker_compat_qual' :new DependencyDescription(
+          licenseUrl: "https://github.com/typetools/checker-framework/blob/master/LICENSE.txt",
+          licenseName: "GPL v2 (with the classpath exception)"),
+    ]
+
     Project project
 
     void collectDependencies() {
@@ -143,6 +163,13 @@ class ChromiumDepGraph {
             if (dep.id?.endsWith("_license")) {
                 dep.exclude = true
             }
+        } else if (dep.licenseName?.isEmpty()) {
+            def fallbackProperties = FALLBACK_PROPERTIES.get(id)
+            if (fallbackProperties != null) {
+                project.logger.debug("Using fallback properties for ${id}")
+                dep.licenseName = fallbackProperties.licenseName
+                dep.licenseUrl = fallbackProperties.licenseUrl
+            }
         }
 
         return dep