Android: Depend on jni_java explicitly

This CL moves jni_java from base_java's public_dep to a regular dep.
This means that targets which only need jni_java do not need to depend
on the entirety of base_java. A future CL will remove base_java from
targets that no longer need it as a result of this CL and this other CL
for build_java: https://crrev.com/c/3606468

By using dep_operations.py split and then dep_operations.py remove, this
CL avoided adding 326 instances of jni_java across 201 files.

Bug: 1038372
Change-Id: Ifd411a923dc834d37e0a4c80daf5797c355c6f52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3615049
Auto-Submit: Peter Wen <wnwen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Owners-Override: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/main@{#997965}

android_webview/BUILD.gn

@@ -650,6 +650,7 @@ android_library("browser_java") {
     "//android_webview/nonembedded:system_webview_manifest",
     "//android_webview/proto:metrics_bridge_records_proto_java",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//components/android_autofill/browser:java",
     "//components/autofill/android:autofill_java",
@@ -754,6 +755,7 @@ android_library("common_crash_java") {
   deps = [
     ":common_java",
     "//base:base_java",
+    "//base:jni_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
@@ -789,6 +791,7 @@ android_library("common_java") {
   ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//cc/base:cc_base_java",
     "//components/autofill/android:autofill_features_java",

android_webview/glue/BUILD.gn

@@ -16,6 +16,7 @@ android_library("glue_java") {
     "//android_webview/support_library/boundary_interfaces:boundary_interface_java",
     "//android_webview/support_library/callback:callback_java",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//components/content_capture/android:java",
     "//components/embedder_support/android:application_java",

android_webview/nonembedded/BUILD.gn

@@ -39,6 +39,7 @@ android_library("nonembedded_java") {
     "//android_webview/glue:glue_java",
     "//android_webview/proto:metrics_bridge_records_proto_java",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//components/about_ui/android:aboutui_java",
     "//components/crash/android:java",
@@ -125,6 +126,7 @@ android_library("services_java") {
     "//android_webview:common_variations_java",
     "//android_webview/proto:metrics_bridge_records_proto_java",
     "//base:base_java",
+    "//base:jni_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/component_updater/android:component_provider_service_aidl_java",
     "//components/minidump_uploader:minidump_uploader_java",

android_webview/test/BUILD.gn

@@ -94,6 +94,7 @@ android_apk("webview_instrumentation_apk") {
     "//android_webview/js_sandbox:js_sandbox_java",
     "//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",
@@ -234,6 +235,7 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//android_webview/test/embedded_test_server:aw_net_java_test_support",
     "//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",
@@ -492,6 +494,7 @@ android_library("webview_instrumentation_test_utils_java") {
   deps = [
     "//android_webview:common_variations_java",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//components/component_updater/android:embedded_component_loader_java",
     "//components/variations/android:variations_java",
@@ -629,6 +632,7 @@ android_library("android_webview_unittests_java") {
   deps = [
     "//android_webview:android_webview_java",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//content/public/test/android:content_java_test_support",
   ]

android_webview/test/embedded_test_server/BUILD.gn

@@ -15,6 +15,7 @@ android_library("aw_net_java_test_support") {
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
+    "//base:jni_java",
     "//build/android:build_java",
     "//net/android:embedded_test_server_aidl_java",
     "//net/android:net_java",

base/BUILD.gn

@@ -3992,6 +3992,7 @@ if (is_android) {
     ]
 
     deps = [
+      ":jni_java",
       "//build/android:build_java",
       "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
       "//third_party/androidx:androidx_annotation_annotation_experimental_java",
@@ -4001,8 +4002,6 @@ if (is_android) {
       "//third_party/androidx:androidx_multidex_multidex_java",
     ]
 
-    public_deps = [ ":jni_java" ]
-
     sources = [
       "android/java/src/org/chromium/base/ActivityState.java",
       "android/java/src/org/chromium/base/ApiCompatibilityUtils.java",
@@ -4172,6 +4171,7 @@ if (is_android) {
     deps = [
       ":base_java",
       ":base_java_test_support",
+      "//base:jni_java",
       "//base/test:test_support_java",
       "//build/android:build_java",
       "//third_party/android_support_test_runner:runner_java",
@@ -4228,6 +4228,7 @@ if (is_android) {
 
     deps = [
       ":base_java",
+      "//base:jni_java",
       "//build/android:build_java",
       "//third_party/android_sdk:android_test_base_java",
       "//third_party/android_sdk:android_test_mock_java",
@@ -4420,7 +4421,6 @@ if (is_android) {
       ":base_java_process_launcher_test_support",
       ":base_java_test_support",
       ":base_junit_test_support",
-      ":jni_java",
       "//base/test:test_support_java",
       "//build/android:build_java",
       "//third_party/androidx:androidx_annotation_annotation_java",
@@ -4460,6 +4460,7 @@ if (is_android) {
 
     deps = [
       "//base:base_java",
+      "//base:jni_java",
       "//build/android:build_java",
     ]
   }
@@ -4469,6 +4470,7 @@ if (is_android) {
 
     deps = [
       ":base_java",
+      "//base:jni_java",
       "//build/android:build_java",
     ]
 

base/android/jni_generator/BUILD.gn

@@ -22,6 +22,7 @@ android_library("jni_sample_java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
   ]
 
@@ -33,6 +34,7 @@ android_library("jni_annotation_sample_java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
   ]
 

base/test/BUILD.gn

@@ -391,6 +391,7 @@ 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",

chrome/android/BUILD.gn

@@ -2607,6 +2607,7 @@ android_library("base_module_java") {
     "$google_play_services_package:google_firebase_firebase_messaging_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/android/features/autofill_assistant/BUILD.gn

@@ -39,6 +39,7 @@ android_library("autofill_assistant_java_test_support") {
     ":test_support_jni_headers",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//base:jni_java",
     "//build/android:build_java",
     "//components/autofill_assistant/android:java",
     "//components/autofill_assistant/browser:proto_java",

chrome/android/features/cablev2_authenticator/BUILD.gn

@@ -19,6 +19,7 @@ android_library("java") {
     "$google_play_services_package:google_play_services_base_java",
     "$google_play_services_package:google_play_services_tasks_java",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/webauthn/android:java_resources",
     "//components/webauthn/android:java",

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

@@ -11,6 +11,7 @@ android_library("internal_java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//components/favicon/android:java",
 

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

@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
 android_library("public_java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//components/autofill/android:autofill_java",
     "//components/browser_ui/bottomsheet/android:java",
     "//content/public/android:content_java",

chrome/android/features/start_surface/BUILD.gn

@@ -15,6 +15,7 @@ android_library("public_java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",

chrome/android/features/vr/BUILD.gn

@@ -70,6 +70,7 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//cc:cc_java",
     "//chrome/android:chrome_java",

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

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

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

@@ -10,6 +10,7 @@ android_library("java") {
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/android/modules/stack_unwinder/public:java",
   ]

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

@@ -7,6 +7,7 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android/modules/stack_unwinder/public:java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]

chrome/browser/android/browserservices/metrics/BUILD.gn

@@ -14,6 +14,7 @@ android_library("java") {
   ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/android/browserservices/constants:java",
     "//components/browser_ui/util/android:java",

chrome/browser/android/browserservices/verification/BUILD.gn

@@ -15,6 +15,7 @@ android_library("java") {
   ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/android/browserservices/metrics:java",
     "//chrome/browser/flags:java",

chrome/browser/android/messages/BUILD.gn

@@ -11,6 +11,7 @@ android_library("java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
   ]
 }

chrome/browser/banners/android/BUILD.gn

@@ -14,6 +14,7 @@ android_library("java") {
     ":java_resources",
     ":jni_headers",
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android:chrome_jni_headers",
     "//chrome/browser/feature_engagement:java",
     "//chrome/browser/profiles/android:java",

chrome/browser/bluetooth/android/BUILD.gn

@@ -13,6 +13,7 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/android:base_module_java",
     "//chrome/browser/notifications:java",

chrome/browser/commerce/android/BUILD.gn

@@ -13,6 +13,7 @@ android_library("java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/profiles/android:java",
     "//components/commerce/core/android:core_java",

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

@@ -32,6 +32,7 @@ android_library("java") {
   deps = [
     ":jni_headers",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/android:base_module_java",
     "//chrome/android/features/tab_ui:java_resources",

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

@@ -20,6 +20,7 @@ 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/commerce/subscriptions/test/android/test_java_sources.gni

@@ -16,6 +16,7 @@ commerce_subscriptions_junit_test_deps = [
   "//base:base_java",
   "//base:base_java_test_support",
   "//base:base_junit_test_support",
+  "//base:jni_java",
   "//chrome/android:base_module_java",
   "//chrome/browser/android/lifecycle:java",
   "//chrome/browser/flags:java",
@@ -45,6 +46,7 @@ commerce_subscriptions_java_test_sources = [
 commerce_subscriptions_java_test_deps = [
   "//base:base_java",
   "//base:base_java_test_support",
+  "//base:jni_java",
   "//build/android:build_java",
   "//chrome/android:base_module_java",
   "//chrome/browser/android/lifecycle:java",

chrome/browser/consent_auditor/android/BUILD.gn

@@ -12,6 +12,7 @@ android_library("java") {
   sources = [ "java/src/org/chromium/chrome/browser/consent_auditor/ConsentAuditorBridge.java" ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/profiles/android:java",
     "//components/signin/public/android:java",

chrome/browser/content_creation/notes/internal/android/BUILD.gn

@@ -33,6 +33,7 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/content_creation/notes/android:public_java",

chrome/browser/content_creation/reactions/internal/android/BUILD.gn

@@ -26,6 +26,7 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/android:chrome_java",
     "//chrome/browser/content_creation/reactions/android:public_java",

chrome/browser/contextmenu/BUILD.gn

@@ -22,6 +22,7 @@ android_library("java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//components/browser_ui/share/android:java",
     "//components/embedder_support/android:context_menu_java",

chrome/browser/continuous_search/BUILD.gn

@@ -56,6 +56,7 @@ if (is_android) {
       ":data_structures_java",
       ":java_resources",
       "//base:base_java",
+      "//base:jni_java",
       "//build/android:build_java",
       "//chrome/browser/browser_controls/android:java",
       "//chrome/browser/continuous_search/internal:java",

chrome/browser/continuous_search/internal/BUILD.gn

@@ -30,6 +30,7 @@ android_library("java") {
 
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/android:chrome_app_java_resources",
     "//chrome/browser/continuous_search:data_structures_java",

chrome/browser/device_reauth/android/BUILD.gn

@@ -8,6 +8,7 @@ import("//build/config/android/rules.gni")
 android_library("java") {
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//components/browser_ui/strings/android:browser_ui_strings_grd",

chrome/browser/download/android/BUILD.gn

@@ -78,6 +78,7 @@ android_library("java") {
     ":file_provider_java",
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/offline_pages/android:java",