Remove dagger-android

I remove the dagger-android dependency (https://google.github.io/dagger/android).
It is supposed to simplify injection into Activities and other Android components, however it's questionable that it actually makes things simpler.
It seems, we can do very well without it and remove the extra bloat that it brings.

This also takes care of the problem with .info files not having been properly added when introducing dagger 2 in https://chromium-review.googlesource.com/1183903, which was then worked around in https://chromium-review.googlesource.com/1183903.

TBR=jochen

Bug: 787005
Change-Id: Ie6c0de694a7e73303be784dea25ccc0805c4a3f8
Reviewed-on: https://chromium-review.googlesource.com/1193362
Commit-Queue: agrieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587607}

DEPS

@@ -1666,61 +1666,6 @@ deps = {
       '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': [
           {

chrome/android/BUILD.gn

@@ -273,7 +273,6 @@ 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",
@@ -372,8 +371,7 @@ android_library("chrome_java") {
   jar_excluded_patterns = [ "*/AppHooksImpl.class" ]
 
   annotation_processor_deps = [
-    "//third_party/android_deps:dagger_processor",
-    "//third_party/android_deps:dagger_android_processor",
+    "//third_party/android_deps:dagger_processor"
   ]
 }
 

third_party/android_deps/.gitignore

 # JAR and AAR files will be fetched via CIPD.
 libs/*/*.jar
 libs/*/*.aar
-# TODO(pshmakov): Add comment here.
-libs/com_google_dagger_dagger_android/com_google_dagger_dagger_android.info
-libs/com_google_dagger_dagger_android_support/com_google_dagger_dagger_android_support.info

third_party/android_deps/BUILD.gn

@@ -141,13 +141,6 @@ java_annotation_processor("dagger_processor") {
   ]
 }
 
-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`
 
@@ -482,42 +475,6 @@ java_prebuilt("com_google_dagger_dagger_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"
@@ -698,18 +655,6 @@ android_aar_prebuilt("com_google_android_gms_play_services_stats_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"

third_party/android_deps/additional_readme_paths.json

@@ -47,11 +47,6 @@
     "libs/com_google_android_gms_play_services_vision_common",
     "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",

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

tools/android/roll/android_deps/build.gradle

@@ -67,12 +67,9 @@ dependencies {
     // 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

@@ -164,9 +164,9 @@ class ChromiumDepGraph {
                 dep.exclude = true
             }
         } else if (dep.licenseName?.isEmpty()) {
-            def fallbackProperties = FALLBACK_PROPERTIES.get(id)
+            def fallbackProperties = FALLBACK_PROPERTIES.get(dep.id)
             if (fallbackProperties != null) {
-                project.logger.debug("Using fallback properties for ${id}")
+                project.logger.debug("Using fallback properties for ${dep.id}")
                 dep.licenseName = fallbackProperties.licenseName
                 dep.licenseUrl = fallbackProperties.licenseUrl
             }