Android: Replace android_tools with android_deps

Mechanical build change. Will TBR after review.

[email protected]

Bug: 877957
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;master.tryserver.chromium.android:android_cronet_tester
Change-Id: If99deaf4070d7c327b2b8b253057aea3b7a80ca7
Reviewed-on: https://chromium-review.googlesource.com/1216853
Commit-Queue: Peter Wen <[email protected]>
Reviewed-by: agrieve <[email protected]>
Cr-Commit-Position: refs/heads/master@{#590036}

android_webview/BUILD.gn

@@ -917,7 +917,7 @@ android_library("android_webview_java") {
     "//content/public/android:content_java",
     "//device/gamepad:java",
     "//net/android:net_java",
-    "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/android_deps:android_support_annotations_java",
     "//third_party/blink/public:blink_headers_java",
     "//ui/android:ui_java",
   ]
@@ -1006,7 +1006,7 @@ android_library("android_webview_platform_services_java") {
 
   deps = [
     "//base:base_java",
-    "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/android_deps:android_support_annotations_java",
   ]
 
   # The appropriate .class file will be loaded via a dependency to a library

android_webview/tools/automated_ui_tests/BUILD.gn

@@ -57,9 +57,9 @@ instrumentation_test_apk("webview_ui_test_app_test_apk") {
     ":webview_ui_test_app_java",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//third_party/android_deps:android_support_annotations_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/android_tools:android_support_annotations_java",
     "//third_party/android_tools:android_test_base_java",
     "//third_party/espresso:espresso_all_java",
     "//third_party/hamcrest:hamcrest_java",

base/BUILD.gn

@@ -2864,9 +2864,9 @@ if (is_android) {
     ]
 
     deps = [
-      "//third_party/android_tools:android_support_annotations_java",
-      "//third_party/android_tools:android_support_multidex_java",
-      "//third_party/android_tools:android_support_v4_java",
+      "//third_party/android_deps:android_support_annotations_java",
+      "//third_party/android_deps:android_support_multidex_java",
+      "//third_party/android_deps:android_support_v4_java",
       "//third_party/jsr-305:jsr_305_javalib",
     ]
 
@@ -3006,12 +3006,12 @@ if (is_android) {
     deps = [
       ":base_java",
       "//testing/android/reporter:reporter_java",
+      "//third_party/android_deps:android_support_annotations_java",
+      "//third_party/android_deps:android_support_compat_java",
       "//third_party/android_support_test_runner:exposed_instrumentation_api_publish_java",
       "//third_party/android_support_test_runner:rules_java",
       "//third_party/android_support_test_runner:runner_java",
-      "//third_party/android_tools:android_support_annotations_java",
       "//third_party/android_tools:android_support_chromium_java",
-      "//third_party/android_tools:android_support_compat_java",
       "//third_party/android_tools:android_test_mock_java",
       "//third_party/hamcrest:hamcrest_core_java",
       "//third_party/junit",

base/test/BUILD.gn

@@ -421,7 +421,7 @@ if (is_android) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//testing/android/native_test:native_main_runner_java",
-      "//third_party/android_tools:android_support_annotations_java",
+      "//third_party/android_deps:android_support_annotations_java",
       "//third_party/jsr-305:jsr_305_javalib",
     ]
     srcjar_deps = [ ":test_support_java_aidl" ]

build/secondary/third_party/android_tools/BUILD.gn

@@ -68,51 +68,6 @@ if (enable_java_templates) {
       ]
     }
   }
-  android_deps_alias("android_arch_lifecycle_common_java") {
-    android_deps_target_name = "android_arch_lifecycle_common_java"
-  }
-  android_deps_alias("android_arch_lifecycle_runtime_java") {
-    android_deps_target_name = "android_arch_lifecycle_runtime_java"
-  }
-  android_deps_alias("android_support_multidex_java") {
-    android_deps_target_name = "com_android_support_multidex_java"
-  }
-  android_deps_alias("android_support_annotations_java") {
-    android_deps_target_name = "com_android_support_support_annotations_java"
-  }
-  android_deps_alias("android_support_cardview_java") {
-    android_deps_target_name = "com_android_support_cardview_v7_java"
-  }
-  android_deps_alias("android_support_compat_java") {
-    android_deps_target_name = "com_android_support_support_compat_java"
-  }
-  android_deps_alias("android_support_core_ui_java") {
-    android_deps_target_name = "com_android_support_support_core_ui_java"
-  }
-  android_deps_alias("android_support_core_utils_java") {
-    android_deps_target_name = "com_android_support_support_core_utils_java"
-  }
-  android_deps_alias("android_support_design_java") {
-    android_deps_target_name = "com_android_support_design_java"
-  }
-  android_deps_alias("android_support_v4_java") {
-    android_deps_target_name = "android_support_v4_java"
-  }
-  android_deps_alias("android_support_v7_appcompat_java") {
-    android_deps_target_name = "android_support_v7_appcompat_java"
-  }
-  android_deps_alias("android_support_v7_gridlayout_java") {
-    android_deps_target_name = "com_android_support_gridlayout_v7_java"
-  }
-  android_deps_alias("android_support_v7_mediarouter_java") {
-    android_deps_target_name = "com_android_support_mediarouter_v7_java"
-  }
-  android_deps_alias("android_support_v7_recyclerview_java") {
-    android_deps_target_name = "com_android_support_recyclerview_v7_java"
-  }
-  android_deps_alias("android_support_v13_java") {
-    android_deps_target_name = "com_android_support_support_v13_java"
-  }
   android_deps_alias("google_play_services_basement_java") {
     android_deps_target_name =
         "com_google_android_gms_play_services_basement_java"

chrome/android/BUILD.gn

@@ -116,11 +116,11 @@ android_resources("chrome_app_java_resources") {
     "//components/strings:components_strings_grd",
     "//content/public/android:content_java_resources",
     "//third_party/android_data_chart:android_data_chart_java_resources",
+    "//third_party/android_deps:android_support_design_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_gridlayout_java",
+    "//third_party/android_deps:android_support_v7_recyclerview_java",
     "//third_party/android_media:android_media_resources",
-    "//third_party/android_tools:android_support_design_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_gridlayout_java",
-    "//third_party/android_tools:android_support_v7_recyclerview_java",
   ]
   custom_package = "org.chromium.chrome"
 }
@@ -271,21 +271,21 @@ 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:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
+    "//third_party/android_deps:android_support_annotations_java",
+    "//third_party/android_deps:android_support_compat_java",
+    "//third_party/android_deps:android_support_design_java",
+    "//third_party/android_deps:android_support_v13_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_gridlayout_java",
+    "//third_party/android_deps:android_support_v7_mediarouter_java",
+    "//third_party/android_deps:android_support_v7_recyclerview_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_swipe_refresh:android_swipe_refresh_java",
-    "//third_party/android_tools:android_arch_lifecycle_common_java",
-    "//third_party/android_tools:android_arch_lifecycle_runtime_java",
     "//third_party/android_tools:android_gcm_java",
-    "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_compat_java",
-    "//third_party/android_tools:android_support_design_java",
-    "//third_party/android_tools:android_support_v13_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_gridlayout_java",
-    "//third_party/android_tools:android_support_v7_mediarouter_java",
-    "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/blink/public:android_mojo_bindings_java",
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
@@ -504,11 +504,11 @@ junit_binary("chrome_junit_tests") {
     "//mojo/public/java:bindings_java",
     "//mojo/public/java:system_java",
     "//net/android:net_java",
-    "//third_party/android_tools:android_arch_lifecycle_common_java",
-    "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_mediarouter_java",
-    "//third_party/android_tools:android_support_v7_recyclerview_java",
+    "//third_party/android_deps:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_support_annotations_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_mediarouter_java",
+    "//third_party/android_deps:android_support_v7_recyclerview_java",
     "//third_party/blink/public:android_mojo_bindings_java",
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
@@ -639,13 +639,13 @@ android_library("chrome_test_java") {
     "//services/device/public/java:geolocation_java",
     "//services/device/public/java:geolocation_java_test_support",
     "//services/service_manager/public/java:service_manager_java",
+    "//third_party/android_deps:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_support_annotations_java",
+    "//third_party/android_deps:android_support_design_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_recyclerview_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/android_tools:android_arch_lifecycle_common_java",
-    "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_design_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/android_tools:android_test_base_java",
     "//third_party/android_tools:android_test_mock_java",
     "//third_party/android_tools:android_test_runner_java",
@@ -725,10 +725,10 @@ if (enable_vr || (enable_arcore && package_arcore)) {
     "//net/android:net_java_test_support",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/android_tools:android_arch_lifecycle_common_java",
-    "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_recyclerview_java",
+    "//third_party/android_deps:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_support_annotations_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_recyclerview_java",
     "//third_party/custom_tabs_client:custom_tabs_support_java",
     "//third_party/junit",
     "//third_party/ub-uiautomator:ub_uiautomator_java",
@@ -1680,10 +1680,10 @@ instrumentation_test_apk("chrome_sync_shell_test_apk") {
     "//components/sync/android:sync_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/android_tools:android_arch_lifecycle_common_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_test_mock_java",
     "//third_party/junit",
     "//ui/android:ui_java",

chrome/android/webapk/libs/client/BUILD.gn

@@ -19,7 +19,7 @@ android_library("client_java") {
     "//base:base_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
-    "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/android_deps:android_support_annotations_java",
   ]
   srcjar_deps = [ ":runtime_library_version_java" ]
 }

chrome/android/webapk/libs/runtime_library/BUILD.gn

@@ -35,7 +35,7 @@ android_library("runtime_library_for_assets_java") {
       [ "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java" ]
   srcjar_deps = [ ":webapk_service_aidl" ]
   deps = [
-    "//third_party/android_tools:android_support_compat_java",
+    "//third_party/android_deps:android_support_compat_java",
   ]
 }
 
@@ -45,7 +45,7 @@ android_library("runtime_library_for_tests_java") {
       [ "src/org/chromium/webapk/lib/runtime_library/WebApkServiceImpl.java" ]
   deps = [
     ":webapk_service_aidl_java",
-    "//third_party/android_tools:android_support_compat_java",
+    "//third_party/android_deps:android_support_compat_java",
   ]
 }
 

chrome/browser/android/vr/BUILD.gn

@@ -174,10 +174,10 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
-    "//third_party/android_tools:android_arch_lifecycle_common_java",
-    "//third_party/android_tools:android_arch_lifecycle_runtime_java",
-    "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_arch_lifecycle_runtime_java",
+    "//third_party/android_deps:android_support_annotations_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/gvr-android-keyboard:kb_java",
     "//third_party/gvr-android-sdk:gvr_common_java",
     "//ui/android:ui_full_java",

chrome/test/android/BUILD.gn

@@ -87,14 +87,14 @@ android_library("chrome_java_test_support") {
     "//net/android:net_java",
     "//net/android:net_java_test_support",
     "//testing/android/reporter:reporter_java",
+    "//third_party/android_deps:android_arch_lifecycle_common_java",
+    "//third_party/android_deps:android_support_annotations_java",
+    "//third_party/android_deps:android_support_compat_java",
+    "//third_party/android_deps:android_support_design_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_recyclerview_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
-    "//third_party/android_tools:android_arch_lifecycle_common_java",
-    "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_compat_java",
-    "//third_party/android_tools:android_support_design_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/hamcrest:hamcrest_core_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/junit",

chrome/test/android/cast_emulator/BUILD.gn

@@ -22,7 +22,7 @@ android_library("cast_emulator_java") {
   deps = [
     "$google_play_services_package:google_play_services_cast_java",
     "//base:base_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_mediarouter_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_mediarouter_java",
   ]
 }

chromecast/browser/android/BUILD.gn

@@ -91,7 +91,7 @@ android_library("reactive_android_java") {
   deps = [
     "//base:base_java",
     "//chromecast/base:base_java",
-    "//third_party/android_tools:android_support_core_utils_java",
+    "//third_party/android_deps:android_support_core_utils_java",
   ]
 }
 
@@ -143,7 +143,7 @@ android_library("cast_shell_java") {
     "//net/android:net_java",
 
     # TODO(slan): We may need to pass this in as a parameter.
-    "//third_party/android_tools:android_support_core_utils_java",
+    "//third_party/android_deps:android_support_core_utils_java",
     "//ui/android:ui_java",
   ]
 
@@ -185,7 +185,7 @@ junit_binary("cast_shell_junit_tests") {
     "//base:base_junit_test_support",
     "//chromecast/base:cast_base_test_utils_java",
     "//content/public/android:content_java",
-    "//third_party/android_tools:android_support_core_utils_java",
+    "//third_party/android_deps:android_support_core_utils_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
 }

chromecast/media/cma/backend/android/BUILD.gn

@@ -73,8 +73,8 @@ android_library("audio_track_java") {
     "//base:base_java",
     "//chromecast/base:base_java",
     "//chromecast/public:volume_control_enums_java",
-    "//third_party/android_tools:android_support_annotations_java",
-    "//third_party/android_tools:android_support_v13_java",
+    "//third_party/android_deps:android_support_annotations_java",
+    "//third_party/android_deps:android_support_v13_java",
   ]
 }
 

chromecast/public/BUILD.gn

@@ -50,7 +50,7 @@ if (is_android) {
   android_library("volume_control_enums_java") {
     srcjar_deps = [ ":java_enums_volume_control" ]
     deps = [
-      "//third_party/android_tools:android_support_annotations_java",
+      "//third_party/android_deps:android_support_annotations_java",
     ]
   }
 }

components/autofill/android/BUILD.gn

@@ -74,7 +74,7 @@ android_library("autofill_java") {
     ":autofill_java_resources",
     "//base:base_java",
     "//content/public/android:content_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
     "//ui/android:ui_java",
   ]
   java_files = [
@@ -96,7 +96,7 @@ android_library("provider_java") {
   deps = [
     "//base:base_java",
     "//content/public/android:content_java",
-    "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/android_deps:android_support_annotations_java",
   ]
   java_files = [
     "java/src/org/chromium/components/autofill/AutofillProvider.java",

components/background_task_scheduler/BUILD.gn

@@ -54,7 +54,7 @@ if (is_android) {
       "$google_play_services_package:google_play_services_gcm_java",
       "$google_play_services_package:google_play_services_tasks_java",
       "//base:base_java",
-      "//third_party/android_tools:android_support_annotations_java",
+      "//third_party/android_deps:android_support_annotations_java",
     ]
   }
 

components/bookmarks/common/android/BUILD.gn

@@ -19,7 +19,7 @@ source_set("android") {
 android_library("bookmarks_java") {
   deps = [
     "//base:base_java",
-    "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/android_deps:android_support_annotations_java",
   ]
   srcjar_deps = [ ":bookmark_type_javagen" ]
   java_files = [ "java/src/org/chromium/components/bookmarks/BookmarkId.java" ]