Allow material design to be pulled from outside of android_deps

- Exposes material design's deps to be public so that the external
version of material design could depend on its deps from
//third_party/android_deps.

- Replace all usages of the material design target to be a variable.

TBR=just mechanical renaming of material design target

Change-Id: I12e0e6f534aab3fdc0d5f868373f8687d3e41e8e
Bug: 1110346
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2321748Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792354}

build/config/android/config.gni

@@ -124,6 +124,11 @@ if (is_android || is_chromeos) {
     }
   }
 
+  if (!defined(material_design_target)) {
+    material_design_target =
+        "//third_party/android_deps:com_google_android_material_material_java"
+  }
+
   webview_public_framework_dep =
       "//third_party/android_sdk:public_framework_system_java"
   if (!defined(webview_framework_dep)) {

chrome/android/BUILD.gn

@@ -220,7 +220,7 @@ android_resources("chrome_app_java_resources") {
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
   ]
   create_srcjar = false
 }
@@ -476,12 +476,12 @@ android_library("chrome_java") {
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_viewpager_viewpager_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",
     "//third_party/android_deps:com_google_guava_listenablefuture_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:javax_inject_javax_inject_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_sdk:android_gcm_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
@@ -1116,10 +1116,10 @@ android_library("chrome_test_java") {
     # TODO (bjoyce): Remove recyclerview_v7 when espresso tests are migrated
     # to androidx.
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:espresso_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_sdk:android_test_runner_java",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -66,7 +66,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_java",
   ]
@@ -301,9 +301,9 @@ android_library("test_java") {
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_test_runner_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:espresso_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/hamcrest:hamcrest_java",

chrome/android/features/keyboard_accessory/BUILD.gn

@@ -77,8 +77,8 @@ android_library("test_java") {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_test_runner_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:espresso_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
@@ -121,7 +121,7 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//content/public/android:content_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -33,7 +33,7 @@ android_library("internal_java") {
     "//third_party/android_deps:androidx_appcompat_appcompat_resources_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_viewpager_viewpager_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//ui/android:ui_java",
     "//ui/android:ui_utils_java",
   ]

chrome/android/features/start_surface/internal/BUILD.gn

@@ -81,7 +81,7 @@ android_library("java") {
     "//components/user_prefs/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//ui/android:ui_full_java",
   ]
 

chrome/android/features/tab_ui/BUILD.gn

@@ -219,7 +219,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//ui/android:ui_java",
   ]
   resources_package = "org.chromium.chrome.tab_ui"

chrome/browser/download/android/BUILD.gn

@@ -75,7 +75,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_preference_preference_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//ui/android:ui_java",
   ]
 

chrome/browser/privacy/BUILD.gn

@@ -31,7 +31,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_preference_preference_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
   ]
   srcjar_deps = [
     "//chrome/browser/net:secure_dns_management_mode_generated_enum",
@@ -52,7 +52,7 @@ android_resources("java_resources") {
     "//components/browser_ui/strings/android:browser_ui_strings_grd",
     "//components/browser_ui/styles/android:java_resources",
     "//components/browser_ui/widget/android:java_resources",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
   ]
 }
 

chrome/test/android/BUILD.gn

@@ -295,9 +295,9 @@ android_library("chrome_java_test_support") {
     "//third_party/android_deps:androidx_legacy_legacy_support_v4_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:espresso_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

components/browser_ui/http_auth/android/BUILD.gn

@@ -15,7 +15,7 @@ android_library("java") {
     "//components/browser_ui/widget/android:java",
     "//components/strings:components_strings_grd",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//ui/android:ui_java",
   ]
 }

components/translate/content/android/BUILD.gn

@@ -21,7 +21,7 @@ android_resources("java_resources") {
   deps = [
     "//components/browser_ui/widget/android:java_resources",
     "//components/strings:components_strings_grd",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
   ]
 }
 
@@ -40,7 +40,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_core_core_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
   ]
 }
 

third_party/android_deps/BUILD.gn

@@ -79,6 +79,10 @@ java_group("android_support_v17_preference_java") {
   deps = [ ":androidx_leanback_leanback_preference_java" ]
 }
 
+java_group("material_design_java") {
+  deps = [ "$material_design_target" ]
+}
+
 java_annotation_processor("auto_service_processor") {
   main_class = "com.google.auto.service.processor.AutoServiceProcessor"
   deps = [ ":com_google_auto_service_auto_service_java" ]
@@ -161,6 +165,12 @@ java_prebuilt("androidx_annotation_annotation_java") {
   jar_excluded_patterns = [ "META-INF/proguard/*" ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_annotation_annotation_experimental_java") {
+  aar_path = "libs/androidx_annotation_annotation_experimental/annotation-experimental-1.0.0.aar"
+  info_path = "libs/androidx_annotation_annotation_experimental/androidx_annotation_annotation_experimental.info"
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_appcompat_appcompat_java") {
   aar_path = "libs/androidx_appcompat_appcompat/appcompat-1.2.0-beta01.aar"
@@ -238,7 +248,7 @@ android_aar_prebuilt("androidx_coordinatorlayout_coordinatorlayout_java") {
     ":androidx_customview_customview_java",
   ]
 
-  # https:crbug.com/954584
+  # Reduce binary size. https:crbug.com/954584
   ignore_proguard_configs = true
 }
 
@@ -600,7 +610,7 @@ android_aar_prebuilt("androidx_test_espresso_espresso_contrib_java") {
     ":androidx_test_espresso_espresso_core_java",
     ":androidx_test_espresso_espresso_idling_resource_java",
     ":androidx_viewpager_viewpager_java",
-    ":com_google_android_material_material_java",
+    "$material_design_target",
     "//third_party/accessibility_test_framework:accessibility_test_framework_java",
   ]
 }
@@ -702,6 +712,19 @@ android_aar_prebuilt("androidx_test_uiautomator_uiautomator_java") {
   deps = [ ":androidx_test_runner_java" ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_transition_transition_java") {
+  aar_path = "libs/androidx_transition_transition/transition-1.2.0.aar"
+  info_path =
+      "libs/androidx_transition_transition/androidx_transition_transition.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+  ]
+  deps += [ ":androidx_fragment_fragment_java" ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_tvprovider_tvprovider_java") {
   aar_path = "libs/androidx_tvprovider_tvprovider/tvprovider-1.0.0.aar"
@@ -737,6 +760,20 @@ android_aar_prebuilt("androidx_vectordrawable_vectordrawable_animated_java") {
   ]
 }
 
+# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+android_aar_prebuilt("androidx_viewpager2_viewpager2_java") {
+  aar_path = "libs/androidx_viewpager2_viewpager2/viewpager2-1.0.0.aar"
+  info_path =
+      "libs/androidx_viewpager2_viewpager2/androidx_viewpager2_viewpager2.info"
+  deps = [
+    ":androidx_annotation_annotation_java",
+    ":androidx_collection_collection_java",
+    ":androidx_core_core_java",
+    ":androidx_fragment_fragment_java",
+    ":androidx_recyclerview_recyclerview_java",
+  ]
+}
+
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_viewpager_viewpager_java") {
   aar_path = "libs/androidx_viewpager_viewpager/viewpager-1.0.0.aar"
@@ -801,7 +838,7 @@ android_aar_prebuilt("com_android_support_coordinatorlayout_java") {
     ":com_android_support_support_compat_java",
   ]
 
-  # https:crbug.com/954584
+  # Reduce binary size. https:crbug.com/954584
   ignore_proguard_configs = true
 }
 
@@ -1754,16 +1791,6 @@ android_aar_prebuilt("android_arch_lifecycle_livedata_core_java") {
   ]
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_annotation_annotation_experimental_java") {
-  aar_path = "libs/androidx_annotation_annotation_experimental/annotation-experimental-1.0.0.aar"
-  info_path = "libs/androidx_annotation_annotation_experimental/androidx_annotation_annotation_experimental.info"
-
-  # 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("androidx_arch_core_core_common_java") {
   jar_path = "libs/androidx_arch_core_core_common/core-common-2.1.0.jar"
@@ -1939,23 +1966,6 @@ android_aar_prebuilt("androidx_test_espresso_espresso_idling_resource_java") {
   testonly = true
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_transition_transition_java") {
-  aar_path = "libs/androidx_transition_transition/transition-1.2.0.aar"
-  info_path =
-      "libs/androidx_transition_transition/androidx_transition_transition.info"
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [ ":*" ]
-  deps = [
-    ":androidx_annotation_annotation_java",
-    ":androidx_collection_collection_java",
-    ":androidx_core_core_java",
-  ]
-  deps += [ ":androidx_fragment_fragment_java" ]
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 android_aar_prebuilt("androidx_versionedparcelable_versionedparcelable_java") {
   aar_path = "libs/androidx_versionedparcelable_versionedparcelable/versionedparcelable-1.1.0.aar"
@@ -1973,24 +1983,6 @@ android_aar_prebuilt("androidx_versionedparcelable_versionedparcelable_java") {
   ignore_aidl = true
 }
 
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("androidx_viewpager2_viewpager2_java") {
-  aar_path = "libs/androidx_viewpager2_viewpager2/viewpager2-1.0.0.aar"
-  info_path =
-      "libs/androidx_viewpager2_viewpager2/androidx_viewpager2_viewpager2.info"
-
-  # To remove visibility constraint, add this dependency to
-  # //third_party/android_deps/build.gradle.
-  visibility = [ ":*" ]
-  deps = [
-    ":androidx_annotation_annotation_java",
-    ":androidx_collection_collection_java",
-    ":androidx_core_core_java",
-    ":androidx_fragment_fragment_java",
-    ":androidx_recyclerview_recyclerview_java",
-  ]
-}
-
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
 java_prebuilt("backport_util_concurrent_backport_util_concurrent_java") {
   jar_path = "libs/backport_util_concurrent_backport_util_concurrent/backport-util-concurrent-3.1.jar"

third_party/android_deps/build.gradle

@@ -76,6 +76,13 @@ dependencies {
     compile "androidx.viewpager:viewpager:${androidXSupportLibVersion}"
     compile "androidx.exifinterface:exifinterface:${androidXSupportLibVersion}"
 
+    // Those are for use by doubledown material design
+    compile "androidx.annotation:annotation-experimental:${androidXSupportLibVersion}"
+    compile "androidx.annotation:annotation:${androidXSupportLibVersion}"
+    compile "androidx.lifecycle:lifecycle-runtime:${androidXSupportLibVersion}"
+    compile "androidx.transition:transition:${androidXSupportLibVersion}"
+    compile "androidx.viewpager2:viewpager2:${androidXSupportLibVersion}"
+
     compile "androidx.multidex:multidex:2.0.0"
 
     // Replacement for com.android.support:design

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

@@ -190,6 +190,10 @@ class BuildConfigGenerator extends DefaultTask {
                         depsStr += "\"${existingLib}\","
                     } else if (onlyPlayServices && !isPlayServicesTarget(dep.id)) {
                         depsStr += "\"//third_party/android_deps:${targetName}\","
+                    } else if (dep.id == "com_google_android_material_material") {
+                        // Material design is pulled in via doubledown, should
+                        // use the variable instead of the real target.
+                        depsStr += "\"\\\$material_design_target\","
                     } else {
                         depsStr += "\":${targetName}\","
                     }
@@ -331,11 +335,11 @@ class BuildConfigGenerator extends DefaultTask {
                 break
             case 'com_android_support_coordinatorlayout':
             case 'androidx_coordinatorlayout_coordinatorlayout':
+            case 'com_android_support_design':
                 sb.append('\n')
-                sb.append('  # https:crbug.com/954584\n')
+                sb.append('  # Reduce binary size. https:crbug.com/954584\n')
                 sb.append('  ignore_proguard_configs = true\n')
                 break
-            case 'com_android_support_design':
             case 'com_google_android_material_material':
                 sb.append('\n')
                 sb.append('  # Reduce binary size. https:crbug.com/954584\n')

third_party/espresso/BUILD.gn

@@ -31,7 +31,7 @@ android_java_prebuilt("espresso_contrib_java") {
     ":espresso_core_java",
     "//third_party/accessibility_test_framework:accessibility_test_framework_java",
     "//third_party/android_deps:android_support_v4_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/guava:guava_android_java",
     "//third_party/hamcrest:hamcrest_core_java",
   ]

weblayer/browser/java/BUILD.gn

@@ -31,7 +31,7 @@ android_resources("weblayer_resources") {
     "//components/page_info/android:java_resources",
     "//components/permissions/android:java_resources",
     "//components/translate/content/android:java_resources",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//weblayer:components_java_strings",
   ]
 }
@@ -194,7 +194,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:androidx_media_media_java",
     "//third_party/android_deps:androidx_preference_preference_java",
-    "//third_party/android_deps:com_google_android_material_material_java",
+    "//third_party/android_deps:material_design_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_full_java",
     "//ui/android:ui_java",