Android: Direct deps for chrome/android etc

Replaced chrome/* with chrome/browser/* in the direct deps allowlist.
Will deal with chrome/browser/* directory in a later CL.

Added exception for bundle_module headers since although they need to
depend on their base_module_target's header directly, due to naming, it
is not as easy to undo the special casing that currently exists for
these targets (see the rules.gni comment about the "special group").

Almost 1 second faster for turbine headers, and given most of this CL is
for test targets, probably a good ROI.

Before:
  $ tools/android/build_speed/benchmark.py turbine_headers
  Summary
  gn args: target_os="android" use_goma=true android_fast_local_dev=true
  gn gen: 6.5s
  turbine_headers: 43.6s avg (43.5s, 43.7s)
After:
  $ tools/android/build_speed/benchmark.py turbine_headers
  Summary
  gn args: target_os="android" use_goma=true android_fast_local_dev=true
  gn gen: 6.5s
  turbine_headers: 42.8s avg (42.8s, 42.8s)

Bug: 1092528
Change-Id: I088b996e738248bd08650e453d904208128680f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2300802Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788910}

build/config/android/internal_rules.gni

@@ -3037,7 +3037,8 @@ if (enable_java_templates) {
               [ get_label_info(":$target_name", "label_no_toolchain") ],
               [
                 "//base*",
-                "//chrome*",
+                "//chrome/browser*",
+                "//chromecast*",
                 "//clank*",
                 "//components*",
                 "//content*",
@@ -3050,6 +3051,9 @@ if (enable_java_templates) {
                 "//third_party*",
                 "//ui*",
                 "//weblayer*",
+
+                # This is due to the "special group" bypass.
+                "*_bundle_module__java__header",
               ]) == []
 
       if (invoker.use_turbine && !_allow_transitive_interfaces) {

chrome/android/BUILD.gn

@@ -866,10 +866,12 @@ junit_binary("chrome_junit_tests") {
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
     "//third_party/android_deps:androidx_test_core_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
+    "//third_party/android_support_test_runner:runner_java",
     "//third_party/blink/public:blink_headers_java",
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//third_party/blink/public/mojom:mojom_platform_java",
@@ -1107,6 +1109,7 @@ android_library("chrome_test_java") {
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:androidx_viewpager_viewpager_java",
     "//url:origin_java",
 
@@ -1211,6 +1214,7 @@ if (enable_vr || enable_arcore) {
     "//chrome/android:app_hooks_java",
     "//chrome/android:chrome_java",
     "//chrome/android/features/vr:java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
@@ -1225,6 +1229,7 @@ if (enable_vr || enable_arcore) {
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -1866,6 +1871,7 @@ android_library("browser_java_test_support") {
     "//components/sync/protocol:protocol_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/junit",
   ]
@@ -2430,6 +2436,7 @@ android_test_apk("chrome_smoke_test_apk") {
     "//base:base_java_test_support",
     "//chrome/test/android:chrome_java_test_pagecontroller",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
     "//third_party/ub-uiautomator:ub_uiautomator_java",
@@ -2470,6 +2477,7 @@ android_test_apk("chrome_bundle_smoke_test_apk") {
     "//base:base_java_test_support",
     "//chrome/test/android:chrome_java_test_pagecontroller",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
   ]
@@ -3227,6 +3235,7 @@ android_library("native_java_unittests_java") {
     "//ui/android:ui_java",
     "//ui/android:ui_java_test_support",
     "//url:gurl_java",
+    "//url:origin_java",
     "//url/mojom:url_mojom_gurl_java",
   ]
 

chrome/android/features/autofill_assistant/BUILD.gn

@@ -63,6 +63,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_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/blink/public/mojom:android_mojo_bindings_java",
     "//ui/android:ui_java",
@@ -227,9 +228,11 @@ android_library("autofill_assistant_java_test_support") {
   deps = [
     ":java",
     ":test_support_jni_headers",
+    "//base:base_java",
     "//base:jni_java",
     "//components/autofill_assistant/browser:proto_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
@@ -277,6 +280,7 @@ android_library("test_java") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/password_manager/android_test_helpers:test_support_java",
     "//chrome/browser/preferences:java",
@@ -290,16 +294,20 @@ android_library("test_java") {
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_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_support_test_runner:runner_java",
+    "//third_party/gif_player:gif_player_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
     "//ui/android:ui_full_java",
+    "//ui/android:ui_java_test_support",
     "//url:gurl_java",
   ]
 

chrome/android/features/keyboard_accessory/BUILD.gn

@@ -60,6 +60,7 @@ android_library("test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/messages/android:java",
@@ -73,7 +74,9 @@ android_library("test_java") {
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
+    "//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_support_test_runner:runner_java",
@@ -111,10 +114,12 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//chrome/browser/tabmodel:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
+    "//components/browser_ui/android/bottomsheet:java",
     "//components/embedder_support/android:content_view_java",
     "//components/feature_engagement/public:public_java",
     "//components/module_installer/android:module_installer_java",
     "//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/hamcrest:hamcrest_java",

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

@@ -29,6 +29,7 @@ android_library("internal_java") {
     "//components/feature_engagement/public:public_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_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",

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

@@ -10,6 +10,7 @@ android_library("public_java") {
     "//components/autofill/android:autofill_java",
     "//components/browser_ui/android/bottomsheet:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//ui/android:ui_full_java",
   ]
   sources = [
     "java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingComponent.java",

chrome/android/features/media_router/BUILD.gn

@@ -21,6 +21,7 @@ android_library("java") {
     "//components/browser_ui/media/android:java",
     "//services/media_session/public/cpp/android:media_session_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
@@ -94,13 +95,17 @@ android_library("test_java") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
+    "//chrome/browser/flags:java",
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
+    "//ui/android:ui_java_test_support",
   ]
 }
 
@@ -131,6 +136,7 @@ junit_binary("media_router_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
   ]
 }

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

@@ -79,6 +79,7 @@ android_library("java") {
     "//components/prefs/android: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",
     "//ui/android:ui_full_java",
   ]

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

@@ -10,6 +10,7 @@ android_library("java") {
     "//base:jni_java",
     "//chrome/android/modules/test_dummy/public:java",
     "//chrome/browser/test_dummy:java",
+    "//components/module_installer/android:module_installer_java",
   ]
   sources = [ "java/src/org/chromium/chrome/modules/test_dummy/TestDummyModuleProvider.java" ]
 }

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

@@ -76,6 +76,7 @@ android_library("runtime_library_javatests") {
     "//base:base_java_test_support",
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
   ]

chrome/android/webapk/shell_apk/BUILD.gn

@@ -71,6 +71,7 @@ template("webapk_java") {
       "//chrome/android/webapk/libs/common:common_java",
       "//chrome/android/webapk/libs/common:splash_java",
       "//components/webapk/android/libs/common:java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
     ]
   }
 }
@@ -341,6 +342,7 @@ android_library("shell_apk_javatests") {
     "//base:base_java_test_support",
     "//chrome/android/webapk/libs/common:common_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
   ]
@@ -365,6 +367,7 @@ junit_binary("webapk_shell_apk_junit_tests") {
     "//chrome/android/webapk/libs/runtime_library:runtime_library_for_tests_java",
     "//chrome/android/webapk/test:junit_test_support",
     "//components/webapk/android/libs/common:java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 }
 

chrome/test/BUILD.gn

@@ -80,10 +80,13 @@ if (is_android) {
   android_library("test_support_java") {
     testonly = true
     deps = [
+      "//base:base_java",
       "//chrome/android:chrome_all_java",
       "//components/autofill/android:autofill_java",
       "//components/payments/content/android:java",
       "//components/payments/mojom:mojom_java",
+      "//content/public/android:content_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/blink/public/mojom:android_mojo_bindings_java",
     ]
     sources = [ "android/test_support/src/org/chromium/chrome/test_support/PaymentRequestTestBridge.java" ]

chrome/test/android/BUILD.gn

@@ -43,6 +43,7 @@ android_library("chrome_java_test_pagecontroller") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/browser/ui/android/appmenu/test:test_support_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_drawerlayout_drawerlayout_java",
     "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -67,6 +68,7 @@ instrumentation_test_apk("chrome_java_test_pagecontroller_tests") {
     "//base:base_java_test_support",
     "//chrome/browser/flags:java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit",
   ]
@@ -87,11 +89,13 @@ instrumentation_test_apk("chrome_java_test_wpr_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
+    "//chrome/browser/flags:java",
     "//chrome/browser/tab:java",
     "//chrome/browser/ui/android/native_page:java",
     "//components/embedder_support/android:util_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_android_support_drawerlayout_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//third_party/android_deps:espresso_java",
@@ -119,6 +123,7 @@ instrumentation_test_apk("chrome_java_test_webapk_launch_tests") {
     "//chrome/android/webapk/libs/client:client_java",
     "//components/webapk/android/libs/client:java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/junit",
   ]
@@ -139,6 +144,8 @@ instrumentation_test_apk("chrome_java_test_pagecontroller_codelab") {
   sources = [ "javatests/src/org/chromium/chrome/test/pagecontroller/tests/codelab/SettingsForCodelabTest.java" ]
   deps = [
     ":chrome_java_test_pagecontroller",
+    "//base:base_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/junit",
   ]
 
@@ -248,9 +255,11 @@ android_library("chrome_java_test_support") {
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
+    "//chrome/browser/profiles/android:java",
     "//chrome/browser/settings:test_support_java",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
+    "//chrome/browser/thumbnail/generator:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu/test:test_support_java",
     "//chrome/browser/ui/android/favicon:java",

chrome/test/android/test_trusted_web_activity/BUILD.gn

@@ -13,5 +13,8 @@ android_library("test_trusted_web_activity_java") {
     "src/org/chromium/chrome/browser/browserservices/MessengerService.java",
     "src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java",
   ]
-  deps = [ "//third_party/android_sdk/androidx_browser:androidx_browser_java" ]
+  deps = [
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_sdk/androidx_browser:androidx_browser_java",
+  ]
 }