Android: Remove unused deps on build_java

This CL removes 173 unused dependencies on build_java. When build_java
was added, more dependencies than strictly necessary were added in order
to reduce the likelihood of the refactoring CLs being reverted. Now that
the refactoring CLs have landed, we can remove most of the unused ones
detected by dep_operations.py.

Bug: 1323311
Change-Id: I88a06882803f470dcd057d5d9e02dcaca3b35bd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3638904
Owners-Override: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1003853}

android_webview/test/BUILD.gn

@@ -109,7 +109,6 @@ android_apk("webview_instrumentation_apk") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
     "//components/android_autofill/browser/test_support:component_autofill_provider_java_test_support",
     "//components/content_capture/android/test_support:java",
     "//components/embedder_support/android:util_java",
@@ -250,7 +249,6 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
     "//components/android_autofill/browser:java",
     "//components/android_autofill/browser/test_support:component_autofill_provider_java_test_support",
     "//components/autofill/android:autofill_java",
@@ -491,7 +489,6 @@ android_library("webview_instrumentation_test_mock_services_java") {
     "//android_webview/nonembedded:services_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//components/component_updater/android:component_provider_service_aidl_java",
     "//third_party/junit",
   ]
@@ -647,7 +644,6 @@ android_library("android_webview_unittests_java") {
   deps = [
     "//android_webview:android_webview_java",
     "//base:jni_java",
-    "//build/android:build_java",
     "//content/public/test/android:content_java_test_support",
   ]
   sources = [ "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java" ]
@@ -683,7 +679,6 @@ junit_binary("android_webview_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//components/component_updater/android:embedded_component_loader_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:protobuf_lite_runtime_java",

android_webview/test/embedded_test_server/BUILD.gn

@@ -15,7 +15,6 @@ android_library("aw_net_java_test_support") {
   deps = [
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
     "//net/android:embedded_test_server_aidl_java",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
@@ -65,10 +64,7 @@ android_apk("aw_net_test_support_apk") {
   # just disable it.
   enable_multidex = false
 
-  deps = [
-    ":aw_net_java_test_support",
-    "//build/android:build_java",
-  ]
+  deps = [ ":aw_net_java_test_support" ]
   android_manifest = "java/AndroidManifest.xml"
   apk_name = "ChromiumNetTestAwSupport"
   shared_libraries = [ ":aw_net_java_test_native_support" ]

android_webview/tools/automated_ui_tests/BUILD.gn

@@ -28,7 +28,6 @@ android_library("webview_ui_test_app_java") {
   deps = [
     ":webview_ui_test_app_apk_resources",
     "//base:base_java",
-    "//build/android:build_java",
   ]
 }
 
@@ -59,7 +58,6 @@ instrumentation_test_apk("webview_ui_test_app_test_apk") {
     ":webview_ui_test_app_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_support_test_runner:rules_java",

android_webview/tools/system_webview_shell/BUILD.gn

@@ -62,7 +62,6 @@ android_library("system_webview_shell_apk_java") {
   deps = [
     ":system_webview_shell_apk_resources",
     "//base:base_java",
-    "//build/android:build_java",
     "//third_party/android_deps:guava_android_java",
     "//third_party/androidx:androidx_activity_activity_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
@@ -121,7 +120,6 @@ instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
   deps = [
     ":system_webview_shell_apk_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:rules_java",
@@ -152,7 +150,6 @@ instrumentation_test_apk("system_webview_shell_layout_test_apk") {
     ":system_webview_shell_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_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",

base/BUILD.gn

@@ -4359,10 +4359,7 @@ if (is_android) {
   android_library("base_java_process_launcher_test_support") {
     testonly = true
 
-    deps = [
-      ":base_java",
-      "//build/android:build_java",
-    ]
+    deps = [ ":base_java" ]
 
     sources = [ "test/android/javatests/src/org/chromium/base/process_launcher/TestChildProcessConnection.java" ]
   }
@@ -4389,7 +4386,6 @@ if (is_android) {
 
     deps = [
       ":base_java",
-      "//build/android:build_java",
       "//testing/android/junit:junit_test_support",
       "//third_party/android_deps:robolectric_all_java",
       "//third_party/android_support_test_runner:runner_java",
@@ -4457,7 +4453,6 @@ if (is_android) {
       ":base_java_test_support",
       ":base_junit_test_support",
       "//base/test:test_support_java",
-      "//build/android:build_java",
       "//third_party/androidx:androidx_annotation_annotation_java",
       "//third_party/androidx:androidx_test_runner_java",
       "//third_party/hamcrest:hamcrest_java",
@@ -4505,7 +4500,6 @@ if (is_android) {
     deps = [
       ":base_java",
       "//base:jni_java",
-      "//build/android:build_java",
     ]
 
     sources = [

base/android/jni_generator/BUILD.gn

@@ -66,10 +66,7 @@ shared_library("jni_sample_lib") {
 android_apk("sample_jni_apk") {
   apk_name = "SampleJni"
   android_manifest = "AndroidManifest.xml"
-  deps = [
-    ":jni_sample_java",
-    "//build/android:build_java",
-  ]
+  deps = [ ":jni_sample_java" ]
   shared_libraries = [ ":jni_sample_lib" ]
   jni_registration_header = _registration_header
 }

base/test/BUILD.gn

@@ -392,7 +392,6 @@ if (is_android) {
     deps = [
       "//base:base_java",
       "//base:jni_java",
-      "//build/android:build_java",
       "//testing/android/native_test:native_main_runner_java",
       "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     ]

build/config/android/rules.gni

@@ -3986,7 +3986,6 @@ if (enable_java_templates) {
 
       if (!defined(use_default_launcher) || use_default_launcher) {
         deps += [
-          "//build/android:build_java",
           "//build/android/gtest_apk:native_test_instrumentation_test_runner_java",
           "//testing/android/native_test:native_test_java",
         ]

chrome/android/BUILD.gn

@@ -951,7 +951,6 @@ junit_binary("chrome_junit_tests") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//build/config/android/test/classpath_order:junit_tests",
     "//cc:cc_java",
     "//chrome/android:update_proto_java",
@@ -1302,7 +1301,6 @@ android_library("chrome_unit_test_java") {
     ":chrome_unit_test_util_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/contextmenu:java",
     "//chrome/browser/first_run/android:java",
@@ -1361,7 +1359,6 @@ android_library("chrome_test_java") {
     "$google_play_services_package:google_play_services_tasks_java",
     "//base:base_java_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//build/config/android/test/resource_overlay:javatests",
     "//cc:cc_java",
     "//chrome/android:chrome_java",
@@ -1754,7 +1751,6 @@ if (enable_vr || enable_arcore) {
     ":chrome_test_util_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:delegate_public_impl_java",
     "//chrome/android/features/vr:java",
@@ -2631,7 +2627,6 @@ android_library("base_module_java") {
     "$google_play_services_package:google_play_services_gcm_java",
     "//base:base_java",
     "//base:jni_java",
-    "//build/android:build_java",
     "//chrome/browser/download/android:file_provider_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/language/android:base_module_java",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -115,7 +115,6 @@ android_library("test_java") {
     ":test_support_jni_headers",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_app_java_resources",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",

chrome/android/features/dev_ui/BUILD.gn

@@ -14,10 +14,7 @@ buildflag_header("buildflags") {
 }
 
 android_library("java") {
-  deps = [
-    "//build/android:build_java",
-    "//chrome/android/features/dev_ui/public:java",
-  ]
+  deps = [ "//chrome/android/features/dev_ui/public:java" ]
   sources =
       [ "internal/java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
 }

chrome/android/features/keyboard_accessory/BUILD.gn

@@ -61,7 +61,6 @@ android_library("test_java") {
     "public:public_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
@@ -120,7 +119,6 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",

chrome/android/features/tab_ui/BUILD.gn

@@ -172,7 +172,6 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:ui_locale_string_resources",
     "//chrome/android/features/start_surface:public_java",

chrome/android/modules/cablev2_authenticator/internal/BUILD.gn

@@ -8,7 +8,6 @@ import("//chrome/android/modules/buildflags.gni")
 android_library("java") {
   sources = [ "java/src/org/chromium/chrome/modules/cablev2_authenticator/ModuleImpl.java" ]
   deps = [
-    "//build/android:build_java",
     "//chrome/android/features/cablev2_authenticator:java",
     "//chrome/android/modules/cablev2_authenticator/public:java",
   ]

chrome/android/modules/dev_ui/provider/BUILD.gn

@@ -7,7 +7,6 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   deps = [
     "//base:jni_java",
-    "//build/android:build_java",
     "//chrome/android/features/dev_ui/public:java",
     "//components/module_installer/android:module_installer_java",
   ]

chrome/android/modules/test_dummy/internal/BUILD.gn

@@ -8,7 +8,6 @@ import("//chrome/android/modules/buildflags.gni")
 android_library("java") {
   sources = [ "java/src/org/chromium/chrome/modules/test_dummy/TestDummyProviderImpl.java" ]
   deps = [
-    "//build/android:build_java",
     "//chrome/android/modules/test_dummy/public:java",
     "//chrome/browser/test_dummy:java",
     "//chrome/browser/test_dummy/internal:java",

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

@@ -30,7 +30,6 @@ junit_binary("webapk_client_junit_tests") {
     ":client_java",
     "//base:base_java",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//chrome/android/webapk/test:junit_test_support",

chrome/android/webapk/shell_apk/BUILD.gn

@@ -372,7 +372,6 @@ android_library("shell_apk_javatests") {
     ":webapk_generated_webapk_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:runner_java",

chrome/browser/android/webapps/launchpad/BUILD.gn

@@ -86,7 +86,6 @@ android_library("junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/android/browserservices/intents:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/test/android:chrome_java_test_support",

chrome/browser/banners/android/BUILD.gn

@@ -52,7 +52,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",

chrome/browser/browser_controls/android/BUILD.gn

@@ -34,7 +34,6 @@ java_library("junit") {
     ":java",
     "//base:base_java",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//cc:cc_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:robolectric_all_java",

chrome/browser/commerce/merchant_viewer/android/BUILD.gn

@@ -160,7 +160,6 @@ android_library("javatests") {
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/commerce/merchant_viewer:optimization_guide_protos_java",
     "//chrome/browser/commerce/merchant_viewer/android:java",
     "//chrome/browser/flags:java",

chrome/browser/commerce/subscriptions/android/java_sources.gni

@@ -21,7 +21,6 @@ commerce_subscriptions_java_sources = [
 commerce_subscriptions_java_deps = [
   "//base:base_java",
   "//base:jni_java",
-  "//build/android:build_java",
   "//chrome/android:base_module_java",
   "//chrome/browser/android/lifecycle:java",
   "//chrome/browser/endpoint_fetcher:java",

chrome/browser/continuous_search/BUILD.gn

@@ -134,7 +134,6 @@ if (is_android) {
       ":java",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//chrome/android:chrome_java",
       "//chrome/browser/continuous_search/internal:java",
       "//chrome/browser/flags:java",
@@ -177,7 +176,6 @@ if (is_android) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//base:base_junit_test_support",
-      "//build/android:build_java",
       "//chrome/browser/browser_controls/android:java",
       "//chrome/browser/continuous_search/internal:java",
       "//chrome/browser/flags:java",

chrome/browser/device/BUILD.gn

@@ -34,7 +34,6 @@ android_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//chrome/test/android:chrome_java_test_support",
     "//net/android:net_java",
     "//third_party/android_deps:robolectric_all_java",

chrome/browser/download/android/BUILD.gn

@@ -168,7 +168,6 @@ android_library("download_java_tests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/profiles/android:java",
@@ -210,7 +209,6 @@ android_library("junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/test/android:chrome_java_test_support",

chrome/browser/download/internal/android/BUILD.gn

@@ -288,7 +288,6 @@ android_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/download/android:java",
     "//chrome/browser/profiles/android:java",
     "//components/browser_ui/util/android:java",

chrome/browser/feed/android/BUILD.gn

@@ -311,7 +311,6 @@ android_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/feedback/android:java",
     "//chrome/browser/flags:java",

chrome/browser/flags/BUILD.gn

@@ -106,7 +106,6 @@ android_library("javatests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//chrome/test/android:chrome_java_test_support",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_support_test_runner:runner_java",

chrome/browser/notifications/BUILD.gn

@@ -121,7 +121,6 @@ if (is_android) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//base:base_junit_test_support",
-      "//build/android:build_java",
       "//chrome/browser/flags:java",
       "//chrome/browser/preferences:java",
       "//chrome/test/android:chrome_java_test_support",
@@ -157,7 +156,6 @@ if (is_android) {
       ":java",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//chrome/browser/flags:java",
       "//chrome/browser/preferences:java",
       "//chrome/test/android:chrome_java_test_support",

chrome/browser/optimization_guide/android/BUILD.gn

@@ -80,7 +80,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_test_util_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",

chrome/browser/page_annotations/test/android/BUILD.gn

@@ -45,7 +45,6 @@ android_library("javatests") {
 
   deps = [
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/endpoint_fetcher:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/page_annotations/android:java",

chrome/browser/partnercustomizations/BUILD.gn

@@ -54,7 +54,6 @@ android_library("test_support_java") {
     ":delegate_java",
     ":java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:runner_java",
@@ -75,7 +74,6 @@ android_library("javatests") {
     ":java",
     ":test_support_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/test/android:chrome_java_test_support",

chrome/browser/password_check/android/BUILD.gn

@@ -90,7 +90,6 @@ junit_binary("password_check_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/device_reauth/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/password_check/android:password_check_java_enums",
@@ -123,7 +122,6 @@ android_library("test_java") {
     "internal:internal_java",
     "internal:internal_ui_factory_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",

chrome/browser/payments/android/BUILD.gn

@@ -18,7 +18,6 @@ android_library("junit_test_support") {
   bypass_platform_checks = true
   testonly = true
   deps = [
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/profiles/android:java",
@@ -55,7 +54,6 @@ java_library("junit") {
     ":junit_test_support",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/profiles/android:java",
     "//components/payments/content/android:java",

chrome/browser/safety_check/android/BUILD.gn

@@ -104,7 +104,6 @@ android_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/password_check:public_java",
     "//chrome/browser/password_check/android:password_check_java_enums",

chrome/browser/subresource_filter/BUILD.gn

@@ -14,10 +14,7 @@ if (is_android) {
   android_library("subresource_filter_java_test_support") {
     testonly = true
     sources = [ "../../android/javatests/src/org/chromium/chrome/browser/subresource_filter/TestRulesetPublisher.java" ]
-    deps = [
-      "//base:jni_java",
-      "//build/android:build_java",
-    ]
+    deps = [ "//base:jni_java" ]
   }
 
   android_library("subresource_filter_javatests") {

chrome/browser/tab_group/BUILD.gn

@@ -35,7 +35,6 @@ java_library("junit") {
     ":java",
     "//base:base_java",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/test/android:chrome_java_test_support",

chrome/browser/tabpersistence/BUILD.gn

@@ -30,7 +30,6 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//chrome/browser/tab:java",
     "//chrome/test/android:chrome_java_test_support",
     "//third_party/android_deps:robolectric_all_java",

chrome/browser/touch_to_fill/android/BUILD.gn

@@ -59,7 +59,6 @@ junit_binary("touch_to_fill_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
     "//chrome/browser/flags:java",
@@ -94,7 +93,6 @@ android_library("test_java") {
     ":public_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",

chrome/browser/ui/android/appmenu/internal/BUILD.gn

@@ -74,7 +74,6 @@ android_library("javatests") {
     ":test_java_resources",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/ui/android/appmenu:java",

chrome/browser/ui/android/appmenu/test/BUILD.gn

@@ -13,7 +13,6 @@ android_library("test_support_java") {
   ]
   deps = [
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu/internal:java",
     "//ui/android:ui_no_recycler_view_java",

chrome/browser/ui/android/default_browser_promo/BUILD.gn

@@ -31,7 +31,6 @@ java_library("junit") {
     ":java",
     "//base:base_java",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",

chrome/browser/ui/android/layouts/test/BUILD.gn

@@ -14,7 +14,6 @@ android_library("java") {
     "..:java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//content/public/test/android:content_java_test_support",
   ]
 }

chrome/browser/ui/android/logo/BUILD.gn

@@ -88,7 +88,6 @@ android_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android/features/start_surface:public_java",
     "//chrome/browser/flags:java",

chrome/browser/ui/android/multiwindow/BUILD.gn

@@ -82,7 +82,6 @@ java_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/util:java",
     "//components/favicon/android:java",
@@ -107,7 +106,6 @@ android_library("javatests") {
   deps = [
     ":java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/test/android:chrome_java_test_support",

chrome/browser/ui/android/night_mode/BUILD.gn

@@ -85,7 +85,6 @@ android_library("javatests") {
     ":night_mode_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/settings:java",
@@ -121,7 +120,6 @@ android_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/feedback/android:java",
     "//chrome/browser/flags:java",

chrome/browser/ui/android/omnibox/BUILD.gn

@@ -235,7 +235,6 @@ android_library("javatests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_sdk:android_test_mock_java",

chrome/browser/ui/android/quickactionsearchwidget/BUILD.gn

@@ -33,7 +33,6 @@ android_library("javatests") {
     ":java_resources",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_app_java_resources",
     "//chrome/android:chrome_java",
     "//chrome/browser/android/browserservices/intents:java",

chrome/browser/ui/android/searchactivityutils/BUILD.gn

@@ -36,7 +36,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/search_engines/android:java",
     "//components/search_engines/android:java",

chrome/browser/ui/android/signin/BUILD.gn

@@ -148,7 +148,6 @@ android_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//chrome/android/features/start_surface:public_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
@@ -191,7 +190,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",

chrome/browser/ui/android/toolbar/BUILD.gn

@@ -342,7 +342,6 @@ android_library("javatests") {
     ":java_resources",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/settings:test_support_java",

chrome/browser/ui/android/webid/internal/BUILD.gn

@@ -108,7 +108,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
 
     # TODO(majidvp): Remove this dependency after test clean up. https://crbug.com/1214820
     "//chrome/android:chrome_java",

chrome/browser/uid/android/BUILD.gn

@@ -29,7 +29,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//chrome/browser/preferences:java",
     "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",

chrome/browser/user_education/BUILD.gn

@@ -36,7 +36,6 @@ android_library("javatests") {
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",

chrome/browser/video_tutorials/BUILD.gn

@@ -132,7 +132,6 @@ if (is_android) {
     deps = [
       ":java",
       "//base:base_java",
-      "//build/android:build_java",
       "//components/image_fetcher:java",
       "//third_party/androidx:androidx_annotation_annotation_java",
       "//third_party/gif_player:gif_player_java",

chrome/browser/video_tutorials/internal/BUILD.gn

@@ -185,7 +185,6 @@ if (is_android) {
       ":java_resources",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//chrome/browser/flags:java",
       "//chrome/browser/video_tutorials:java",
       "//chrome/browser/video_tutorials:test_support_java",

chrome/test/BUILD.gn

@@ -1053,7 +1053,6 @@ if (is_android) {
     deps = [
       "//base:base_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//build/android/gtest_apk:native_test_instrumentation_test_runner_java",
       "//chrome/android:base_module_java",
       "//chrome/android:chrome_all_java",
@@ -6181,7 +6180,6 @@ test("unit_tests") {
     ]
 
     deps += [
-      "//build/android:build_java",
       "//chrome:chrome_android_core",
       "//chrome/android:chrome_apk_paks",
       "//chrome/android:chrome_java",
@@ -9522,7 +9520,6 @@ if (is_android) {
     testonly = true
     deps = [
       "//base:jni_java",
-      "//build/android:build_java",
       "//chrome/android:chrome_all_java",
       "//chrome/browser/profiles/android:java",
       "//chrome/test/android:chrome_java_test_support",

chrome/test/android/BUILD.gn

@@ -41,7 +41,6 @@ android_library("chrome_java_test_pagecontroller") {
     ":chrome_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//third_party/android_deps:guava_android_java",
@@ -100,7 +99,6 @@ instrumentation_test_apk("chrome_java_test_wpr_tests") {
   deps = [
     ":chrome_java_test_support",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/tab:java",
@@ -136,7 +134,6 @@ instrumentation_test_apk("chrome_java_test_feed_test") {
   deps = [
     ":chrome_java_test_support",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/tab:java",
@@ -170,7 +167,6 @@ instrumentation_test_apk("chrome_webapk_integration_tests") {
     ":chrome_java_test_pagecontroller",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
@@ -229,7 +225,6 @@ junit_binary("chrome_java_test_pagecontroller_junit_tests") {
     ":chrome_java_test_pagecontroller",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//third_party/ub-uiautomator:ub_uiautomator_java",
   ]
 }

components/BUILD.gn

@@ -702,7 +702,6 @@ if (is_android) {
       ":components_browsertests_resources",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//content/public/test/android:content_java_test_support",
       "//content/shell/android:content_shell_browsertests_java",
       "//testing/android/native_test:native_test_java",

components/autofill_assistant/android/BUILD.gn

@@ -179,7 +179,6 @@ android_library("public_java") {
     ":public_dependencies_java",
     "//base:base_java",
     "//base:jni_java",
-    "//build/android:build_java",
     "//components/browser_ui/bottomsheet/android:java",
     "//components/favicon/android:java",
     "//components/image_fetcher:java",
@@ -362,7 +361,6 @@ android_library("autofill_assistant_public_impl_java") {
   deps = [
     ":animated_poodle_resources",
     "//base:base_java",
-    "//build/android:build_java",
     "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
     "//ui/android:ui_java",
   ]

components/background_task_scheduler/BUILD.gn

@@ -131,7 +131,6 @@ if (is_android) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//base:base_junit_test_support",
-      "//build/android:build_java",
       "//components/background_task_scheduler:public_java",
       "//third_party/android_deps:chromium_play_services_availability_shadows_java",
       "//third_party/android_deps:robolectric_all_java",

components/background_task_scheduler/internal/BUILD.gn

@@ -104,7 +104,6 @@ if (is_android) {
       "$google_play_services_package:google_play_services_gcm_java",
       "$google_play_services_package:google_play_services_tasks_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
       "//components/background_task_scheduler:public_java",
       "//content/public/test/android:content_java_test_support",

components/browser_ui/bottomsheet/android/internal/BUILD.gn

@@ -41,7 +41,6 @@ android_library("junit_tests") {
     ":java",
     "//base:base_java",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
@@ -59,7 +58,6 @@ android_library("javatests") {
     "../test:java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//components/browser_ui/widget/android:java",
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/junit",

components/browser_ui/bottomsheet/android/test/BUILD.gn

@@ -18,7 +18,6 @@ android_library("java") {
     "../internal:java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]

components/browser_ui/media/android/BUILD.gn

@@ -88,7 +88,6 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//content/public/android:content_java",
     "//services/media_session/public/cpp/android:media_session_java",
     "//services/media_session/public/mojom:mojom_java",

components/browser_ui/share/android/BUILD.gn

@@ -73,7 +73,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/androidx:androidx_annotation_annotation_java",

components/browser_ui/webshare/android/BUILD.gn

@@ -37,7 +37,6 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",

components/browser_ui/widget/android/BUILD.gn

@@ -334,7 +334,6 @@ android_library("javatests") {
     ":test_support_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//components/browser_ui/test/android:test_support_java",
     "//components/browser_ui/theme/android:java_resources",
     "//content/public/test/android:content_java_test_support",
@@ -397,7 +396,6 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/androidx:androidx_test_runner_java",

components/embedder_support/android/BUILD.gn

@@ -276,7 +276,6 @@ android_library("native_java_unittests_java") {
   deps = [
     ":util_java",
     "//base:jni_java",
-    "//build/android:build_java",
     "//third_party/junit",
   ]
   sources = [ "native_java_unittests/src/org/chromium/components/embedder_support/util/InputStreamUnittest.java" ]
@@ -330,7 +329,6 @@ android_library("embedder_support_javatests") {
     ":web_contents_delegate_java",
     ":web_contents_delegate_java_resources",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",

components/externalauth/android/BUILD.gn

@@ -53,7 +53,6 @@ android_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",

components/installedapp/android/BUILD.gn

@@ -74,7 +74,6 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//content/public/android:content_full_java",
     "//third_party/junit",
   ]

components/language/android/BUILD.gn

@@ -56,10 +56,7 @@ android_library("ulp_delegate_java") {
 android_library("ulp_delegate_public_java") {
   sources = [ "java/src/org/chromium/components/language/LanguageProfileDelegateImpl.java" ]
 
-  deps = [
-    ":ulp_delegate_java",
-    "//build/android:build_java",
-  ]
+  deps = [ ":ulp_delegate_java" ]
 }
 
 java_library("junit") {
@@ -73,7 +70,6 @@ java_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//components/browser_ui/widget/android:java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
@@ -93,7 +89,6 @@ android_library("javatests") {
     ":java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/test/android:content_java_test_support",

components/media_router/browser/android/BUILD.gn

@@ -150,7 +150,6 @@ java_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:robolectric_all_java",
     "//third_party/androidx:androidx_annotation_annotation_java",

components/media_router/test/android/cast_emulator/BUILD.gn

@@ -22,7 +22,6 @@ android_library("cast_emulator_java") {
   deps = [
     "$google_play_services_package:google_play_services_cast_java",
     "//base:base_java",
-    "//build/android:build_java",
     "//third_party/androidx:androidx_mediarouter_mediarouter_java",
   ]
 }

components/messages/android/internal/BUILD.gn

@@ -83,7 +83,6 @@ android_library("javatests") {
     "..:java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//components/browser_ui/test/android:test_support_java",
     "//components/browser_ui/widget/android:java",
     "//content/public/test/android:content_java_test_support",

components/messages/android/test/BUILD.gn

@@ -16,7 +16,6 @@ android_library("test_support_java") {
   deps = [
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
     "//components/messages/android:java",
     "//components/messages/android/internal:java",
     "//ui/android:ui_no_recycler_view_java",

components/minidump_uploader/BUILD.gn

@@ -82,7 +82,6 @@ android_library("minidump_uploader_javatests") {
     ":minidump_uploader_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/junit",

components/module_installer/android/BUILD.gn

@@ -34,7 +34,6 @@ android_library("module_installer_java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
-    "//build/android:build_java",
     "//components/crash/android:java",
     "//third_party/android_deps:com_google_android_play_core_java",
     "//third_party/androidx:androidx_annotation_annotation_java",

components/module_installer/android/module_desc_java.gni

@@ -70,10 +70,7 @@ template("module_desc_java") {
   }
 
   android_library(_target_name) {
-    deps = [
-      "//build/android:build_java",
-      "//components/module_installer/android:module_installer_java",
-    ]
+    deps = [ "//components/module_installer/android:module_installer_java" ]
     srcjar_deps = [ ":${_target_name}__srcjar" ]
   }
 }

components/paint_preview/player/android/BUILD.gn

@@ -140,7 +140,6 @@ android_library("javatests") {
     ":player_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:rules_java",
@@ -194,7 +193,6 @@ junit_binary("paint_preview_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//ui/android:ui_full_java",
     "//url:gurl_java",

components/payments/content/android/BUILD.gn

@@ -348,7 +348,6 @@ java_library("junit") {
     ":junit_test_support",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//components/browser_ui/bottomsheet/android:java",
     "//components/payments/content/android:service_java",
     "//components/payments/mojom:mojom_java",

components/policy/android/BUILD.gn

@@ -97,7 +97,6 @@ android_library("native_test_support_java") {
   deps = [
     ":policy_java",
     "//base:jni_java",
-    "//build/android:build_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
   ]

components/query_tiles/BUILD.gn

@@ -143,7 +143,6 @@ if (is_android) {
       ":test_support_java",
       "//base:base_java",
       "//base:base_junit_test_support",
-      "//build/android:build_java",
       "//third_party/android_deps:robolectric_all_java",
       "//third_party/junit",
     ]

components/signin/public/android/BUILD.gn

@@ -134,7 +134,6 @@ android_library("javatests") {
     ":signin_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -168,7 +167,6 @@ java_library("junit") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//components/externalauth/android:google_delegate_public_impl_java",
     "//components/externalauth/android:java",
     "//testing/android/junit:junit_test_support",

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

@@ -30,7 +30,6 @@ java_library("junit") {
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//base/test:test_support_java",
-    "//build/android:build_java",
     "//components/webapk/android/libs/common:java",
     "//testing/android/junit:junit_test_support",
     "//third_party/android_deps:robolectric_all_java",

content/public/android/BUILD.gn

@@ -646,7 +646,6 @@ junit_binary("content_junit_tests") {
     "//base:base_java_process_launcher_test_support",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//content/public/test/android:content_java_test_support",
     "//media/mojo/mojom:mojom_java",
     "//mojo/public/java:base_java",

content/public/test/android/BUILD.gn

@@ -11,7 +11,6 @@ android_library("android_test_message_pump_support_java") {
   deps = [
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
   ]
   sources = [ "javatests/src/org/chromium/content_public/browser/test/NestedSystemMessageHandler.java" ]
 }
@@ -23,7 +22,6 @@ android_library("content_java_test_support") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
     "//net/android:net_java",

content/shell/android/BUILD.gn

@@ -196,7 +196,6 @@ template("content_shell_apk_tmpl") {
       ":content_shell_assets",
       ":content_shell_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//components/crash/android:java",
       "//components/crash/core/app:chrome_crashpad_handler_named_as_so",
       "//content/public/android:content_java",
@@ -251,7 +250,6 @@ android_library("content_shell_test_java") {
     ":content_shell_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//content/shell/android:content_shell_java",
@@ -277,7 +275,6 @@ android_library("content_shell_browsertests_java") {
   deps = [
     ":content_shell_java",
     "//base:base_java",
-    "//build/android:build_java",
     "//content/public/android:content_java",
     "//testing/android/native_test:native_test_java",
     "//third_party/androidx:androidx_core_core_java",

content/test/BUILD.gn

@@ -1079,7 +1079,6 @@ if (is_android) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//base:jni_java",
-      "//build/android:build_java",
       "//components/download/internal/common:internal_java",
       "//components/viz/service:service_java",
       "//content/public/android:content_java",
@@ -2989,7 +2988,6 @@ if (is_android) {
       "$google_play_services_package:google_play_services_tasks_java",
       "//base:base_java",
       "//base:jni_java",
-      "//build/android:build_java",
       "//content/public/android:content_java",
       "//ui/android:ui_full_java",
     ]

device/BUILD.gn

@@ -441,7 +441,6 @@ if (is_android) {
     deps = [
       "//base:base_java",
       "//base:jni_java",
-      "//build/android:build_java",
       "//components/location/android:location_java",
       "//device/bluetooth:java",
       "//third_party/android_sdk:android_test_mock_java",
@@ -462,7 +461,6 @@ if (is_android) {
       "$google_play_services_package:google_play_services_location_java",
       "//base:base_java_test_support",
       "//base:base_junit_test_support",
-      "//build/android:build_java",
       "//device/gamepad:java",
       "//mojo/public/java:bindings_java",
       "//third_party/androidx:androidx_annotation_annotation_java",

mojo/public/java/system/BUILD.gn

@@ -122,7 +122,6 @@ android_library("mojo_javatests") {
     ":test_support_java",
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
     "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
     "//mojo/public/interfaces/bindings/tests:test_mojom_import2_java",
     "//mojo/public/interfaces/bindings/tests:test_mojom_import_java",
@@ -166,7 +165,6 @@ instrumentation_test_apk("mojo_test_apk") {
   deps = [
     ":mojo_javatests",
     ":system_impl_java",
-    "//build/android:build_java",
     "//mojo/public/interfaces/bindings/tests:test_interfaces",
     "//mojo/public/java:bindings_java",
     "//third_party/androidx:androidx_test_monitor_java",

net/android/BUILD.gn

@@ -105,7 +105,6 @@ android_library("net_java_test_support_provider") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
   ]
 
   data_deps = [ "//net:test_support" ]
@@ -152,7 +151,6 @@ android_apk("net_test_support_apk") {
   deps = [
     ":net_java_test_support",
     ":net_java_test_support_provider",
-    "//build/android:build_java",
   ]
   android_manifest = "../test/android/javatests/AndroidManifest.xml"
   apk_name = "ChromiumNetTestSupport"
@@ -193,7 +191,6 @@ android_library("net_javatests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:jni_java",
-    "//build/android:build_java",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -236,7 +233,6 @@ junit_binary("net_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//build/android:build_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
 }

remoting/android/BUILD.gn

@@ -183,7 +183,6 @@ instrumentation_test_apk("remoting_test_apk") {
     ":remoting_android_client_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//build/android:build_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/junit:junit",

services/BUILD.gn

@@ -122,7 +122,6 @@ if (is_android) {
       "//base:base_java",
       "//base:base_java_test_support",
       "//base:base_junit_test_support",
-      "//build/android:build_java",
       "//mojo/public/java:base_java",
       "//mojo/public/java:bindings_java",
       "//mojo/public/java:system_java",
@@ -153,7 +152,6 @@ if (is_android) {
       "$google_play_services_package:google_play_services_vision_java",
       "//base:base_java",
       "//base:base_java_test_support",
-      "//build/android:build_java",
       "//mojo/public/java:base_java",
       "//mojo/public/java:bindings_java",
       "//mojo/public/mojom/base:base_java",

services/device/public/java/BUILD.gn

@@ -32,7 +32,6 @@ android_library("geolocation_java_test_support") {
   ]
   deps = [
     ":geolocation_java",
-    "//build/android:build_java",
 
     # Ideally this dependency should be removed. http://crbug.com/850357
     "//services/device/geolocation:geolocation_java",

services/tracing/BUILD.gn

@@ -176,10 +176,7 @@ if (is_android) {
 
   android_library("tracing_test_helper_java") {
     testonly = true
-    deps = [
-      "//base:jni_java",
-      "//build/android:build_java",
-    ]
+    deps = [ "//base:jni_java" ]
     sources = [ "android/test/src/org/chromium/tracing/UnwindTestHelper.java" ]
   }
 }

testing/android/native_test/BUILD.gn

@@ -46,10 +46,7 @@ source_set("native_test_native_code") {
 android_library("native_main_runner_java") {
   testonly = true
   sources = [ "java/src/org/chromium/native_test/MainRunner.java" ]
-  deps = [
-    "//base:jni_java",
-    "//build/android:build_java",
-  ]
+  deps = [ "//base:jni_java" ]
 }
 
 android_library("native_test_java") {

testing/android/reporter/BUILD.gn

@@ -9,7 +9,6 @@ android_library("reporter_java") {
   chromium_code = true
 
   deps = [
-    "//build/android:build_java",
     "//build/android/gtest_apk:native_test_instrumentation_test_runner_java",
     "//third_party/android_sdk:android_test_base_java",
   ]

third_party/blink/common/BUILD.gn

@@ -300,10 +300,7 @@ test("blink_common_unittests") {
     "//ui/gfx:test_support",
   ]
   if (is_android) {
-    deps += [
-      "//build/android:build_java",
-      "//media/base/android:media_java",
-    ]
+    deps += [ "//media/base/android:media_java" ]
   }
 
   if (is_fuchsia) {