Reland "JNI annotation processor -> srcjars (batch 1)"

This reverts commit d4e9998970.

Reason for reland: Updated include path

Original change's description:
> Revert "JNI annotation processor -> srcjars (batch 1)"
>
> This reverts commit 541a7aa80e.
>
> Reason for revert: Suspecting for build failures. See https://ci.chromium.org/ui/p/chromium/builders/ci/android-archive-rel/33216/overview
>
> Original change's description:
> > JNI annotation processor -> srcjars (batch 1)
> >
> > * android_webview/BUILD.gn
> > * android_webview/glue/BUILD.gn
> > * android_webview/test/BUILD.gn
> > * mojo/public/java/system/BUILD.gn
> > * net/android/BUILD.gn
> > * services/device/public/java/BUILD.gn
> > * testing/android/native_test/BUILD.gn
> > * ui/android/BUILD.gn
> > * url/BUILD.gn
> > * weblayer/browser/java/BUILD.gn
> >
> > Bug: 1410871
> > Change-Id: Ib87fcdc30208552d65f6adbfee16ca6c5f1bd2e1
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4616415
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Reviewed-by: Sam Maier <smaier@chromium.org>
> > Owners-Override: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1158973}
>
> Bug: 1410871
> Change-Id: Ia18dde59b64920b10aefdca1aafd72a60e84c8c9
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4621593
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Commit-Queue: Kevin McNee <mcnee@chromium.org>
> Owners-Override: Kevin McNee <mcnee@google.com>
> Auto-Submit: Kevin McNee <mcnee@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1159006}

Bug: 1410871
Change-Id: I69b5a3792c224918f32cdd6727949778c6fcf4c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4621156
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1159668}

android_webview/BUILD.gn

@@ -448,11 +448,8 @@ java_group("android_webview_java") {
 group("empty_group") {
 }
 
-generate_jni("common_jni_headers") {
-  sources = [
-    "java/src/org/chromium/android_webview/common/AwResource.java",
-    "java/src/org/chromium/android_webview/common/crash/AwCrashReporterClient.java",
-  ]
+generate_jni("common_jni") {
+  sources = [ "java/src/org/chromium/android_webview/common/AwResource.java" ]
 }
 
 generate_jni("browser_jni_headers") {
@@ -496,12 +493,6 @@ generate_jni("browser_jni_headers") {
     "java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingSafeModeAction.java",
     "java/src/org/chromium/android_webview/variations/VariationsSeedLoader.java",
   ]
-
-  deps = [ ":cancellation_signal_android_jar_jni_headers" ]
-}
-
-generate_jar_jni("cancellation_signal_android_jar_jni_headers") {
-  classes = [ "android/os/CancellationSignal.class" ]
 }
 
 android_library("browser_java") {
@@ -661,13 +652,13 @@ android_library("browser_java") {
     "//ui/android:ui_no_recycler_view_java",
     "//url:gurl_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
   if (enable_spellcheck) {
     deps += [ "//components/spellcheck/browser/android:java" ]
   }
 
   srcjar_deps = [
+    ":browser_jni_headers",
     "//android_webview/browser:browser_enums",
     "//components/safe_browsing/core/browser/db:sb_threat_values",
   ]
@@ -717,15 +708,19 @@ android_library("platform_service_bridge_upstream_implementation_java") {
   deps = [ ":common_platform_services_java" ]
 }
 
+generate_jni("crash_client_jni") {
+  sources = [ "java/src/org/chromium/android_webview/common/crash/AwCrashReporterClient.java" ]
+}
+
 android_library("crash_client_java") {
   sources = [ "java/src/org/chromium/android_webview/common/crash/AwCrashReporterClient.java" ]
+  srcjar_deps = [ ":crash_client_jni" ]
 
   deps = [
     "//base:base_java",
     "//base:jni_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 java_cpp_strings("common_java_switches_srcjar") {
@@ -786,6 +781,7 @@ android_library("common_java") {
   srcjar_deps = [
     ":common_java_features_srcjar",
     ":common_java_switches_srcjar",
+    ":common_jni",
   ]
 }
 

android_webview/common/BUILD.gn

@@ -35,7 +35,8 @@ source_set("common") {
     "url_constants.h",
   ]
   deps = [
-    "//android_webview:common_jni_headers",
+    "//android_webview:common_jni",
+    "//android_webview:crash_client_jni",
     "//base",
     "//components/cdm/common",
     "//components/crash/core/app",

android_webview/common/DEPS

@@ -1,7 +1,7 @@
 include_rules = [
   "-android_webview",
   "+android_webview/common",
-  "+android_webview/common_jni_headers",
+  "+android_webview/common_jni",
   "+components/cdm/common",
   "+components/embedder_support/origin_trials",
   "+components/gwp_asan/common/crash_key_name.h"

android_webview/common/aw_resource.cc

@@ -4,7 +4,7 @@
 
 #include "android_webview/common/aw_resource.h"
 
-#include "android_webview/common_jni_headers/AwResource_jni.h"
+#include "android_webview/common_jni/AwResource_jni.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"

android_webview/common/crash_reporter/DEPS

@@ -1,4 +1,5 @@
 include_rules = [
+  "+android_webview/crash_client_jni",
   "+components/crash",
   "+components/gwp_asan/common/crash_key_name.h",
 ]

android_webview/common/crash_reporter/aw_crash_reporter_client.cc

@@ -10,7 +10,7 @@
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/crash_reporter/crash_keys.h"
-#include "android_webview/common_jni_headers/AwCrashReporterClient_jni.h"
+#include "android_webview/crash_client_jni/AwCrashReporterClient_jni.h"
 #include "base/android/build_info.h"
 #include "base/android/java_exception_reporter.h"
 #include "base/android/jni_android.h"

android_webview/glue/BUILD.gn

@@ -29,7 +29,6 @@ android_library("glue_java") {
     "//ui/android:ui_no_recycler_view_java",
     "//url:gurl_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
   alternative_android_sdk_dep =
       "//third_party/android_sdk:public_framework_system_java"

android_webview/test/BUILD.gn

@@ -196,8 +196,8 @@ generate_jni("draw_fn_impl_jni_headers") {
 android_library("draw_fn_impl_java") {
   sources =
       [ "shell/src/org/chromium/android_webview/shell/ContextManager.java" ]
+  srcjar_deps = [ ":draw_fn_impl_jni_headers" ]
   deps = [ "//base:jni_java" ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 shared_library_with_jni("libstandalonelibwebviewchromium") {
@@ -235,6 +235,11 @@ shared_library_with_jni("libstandalonelibwebviewchromium") {
   java_targets = [ ":webview_instrumentation_apk" ]
 }
 
+generate_jni("webview_instrumentation_test_jni") {
+  testonly = true
+  sources = [ "../javatests/src/org/chromium/android_webview/test/component_updater/EmbeddedComponentLoaderTest.java" ]
+}
+
 instrumentation_test_apk("webview_instrumentation_test_apk") {
   apk_name = "WebViewInstrumentationTest"
   apk_under_test = ":webview_instrumentation_apk"
@@ -493,7 +498,10 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//android_webview/test/embedded_test_server:aw_net_test_support_apk",
     "//net/android:net_test_support_apk",
   ]
-  srcjar_deps = [ ":libstandalonelibwebviewchromium__jni_registration" ]
+  srcjar_deps = [
+    ":libstandalonelibwebviewchromium__jni_registration",
+    ":webview_instrumentation_test_jni",
+  ]
 }
 
 android_library("webview_instrumentation_test_mock_services_java") {
@@ -523,6 +531,7 @@ android_library("webview_instrumentation_test_utils_java") {
     "../javatests/src/org/chromium/android_webview/test/util/VariationsTestUtils.java",
     "shell/src/org/chromium/android_webview/test/util/MemoryMetricsLoggerUtils.java",
   ]
+  srcjar_deps = [ ":webview_instrumentation_test_native_jni" ]
   deps = [
     "//android_webview:common_variations_java",
     "//base:base_java_test_support",
@@ -533,13 +542,11 @@ android_library("webview_instrumentation_test_utils_java") {
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 generate_jni("webview_instrumentation_test_native_jni") {
   testonly = true
   sources = [
-    "../javatests/src/org/chromium/android_webview/test/component_updater/EmbeddedComponentLoaderTest.java",
     "../javatests/src/org/chromium/android_webview/test/util/EmbeddedComponentLoaderFactory.java",
     "../javatests/src/org/chromium/android_webview/test/util/RendererProcessMetricsProviderUtils.java",
     "../javatests/src/org/chromium/android_webview/test/util/VariationsTestUtils.java",
@@ -556,6 +563,7 @@ source_set("webview_instrumentation_test_native_jni_impl") {
   ]
 
   deps = [
+    ":webview_instrumentation_test_jni",
     ":webview_instrumentation_test_native_jni",
     "//android_webview/browser",
     "//android_webview/browser/metrics",
@@ -674,6 +682,7 @@ android_library("android_webview_unittests_java") {
     "//content/public/test/android:content_java_test_support",
   ]
   sources = [ "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java" ]
+  srcjar_deps = [ ":android_webview_unittests_jni" ]
 }
 
 generate_jni("android_webview_unittests_jni") {

android_webview/test/browser/embedded_component_loader_test_helper.cc

@@ -9,8 +9,8 @@
 #include <utility>
 #include <vector>
 
+#include "android_webview/test/webview_instrumentation_test_jni/EmbeddedComponentLoaderTest_jni.h"
 #include "android_webview/test/webview_instrumentation_test_native_jni/EmbeddedComponentLoaderFactory_jni.h"
-#include "android_webview/test/webview_instrumentation_test_native_jni/EmbeddedComponentLoaderTest_jni.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"

android_webview/test/embedded_test_server/BUILD.gn

@@ -20,7 +20,7 @@ android_library("aw_net_java_test_support") {
     "//net/android:embedded_test_server_aidl_java",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
-    "//net/android:net_java_test_support_provider",
+    "//net/android:net_test_support_provider_java",
   ]
 }
 
@@ -45,7 +45,7 @@ source_set("aw_java_test_native_support") {
   ]
   public_deps = [
     ":aw_net_jni_headers",
-    "//net:net_test_jni_headers",
+    "//net/android:net_test_support_provider_jni",
   ]
 }
 

content/shell/android/BUILD.gn

@@ -229,7 +229,7 @@ content_shell_apk_tmpl("content_shell_test_apk") {
     "//base:base_java_test_support",
     "//base:base_javatests",
     "//content/public/android:content_javatests",
-    "//net/android:net_javatests",
+    "//net/android:net_tests_java",
   ]
   data_deps = [ "//testing/buildbot/filters:content_shell_test_apk_filters" ]
   if (enable_chrome_android_internal) {

mojo/public/java/system/BUILD.gn

@@ -14,15 +14,6 @@ group("system") {
   ]
 }
 
-generate_jni("jni_headers") {
-  testonly = true
-  sources = [
-    "javatests/src/org/chromium/mojo/MojoTestRule.java",
-    "javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java",
-  ]
-  public_deps = [ ":system_impl_java_jni_headers" ]
-}
-
 generate_jni("system_impl_java_jni_headers") {
   sources = [
     "src/org/chromium/mojo/system/impl/BaseRunLoop.java",
@@ -58,6 +49,7 @@ android_library("system_impl_java") {
     "src/org/chromium/mojo/system/impl/UntypedHandleImpl.java",
     "src/org/chromium/mojo/system/impl/WatcherImpl.java",
   ]
+  srcjar_deps = [ ":system_impl_java_jni_headers" ]
 
   deps = [
     "//base:base_java",
@@ -65,14 +57,18 @@ android_library("system_impl_java") {
     "//build/android:build_java",
     "//mojo/public/java:system_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}
+
+generate_jni("test_support_jni") {
+  testonly = true
+  sources = [ "javatests/src/org/chromium/mojo/MojoTestRule.java" ]
 }
 
 # Targets should also depend on :test_support for the native side.
 android_library("test_support_java") {
   testonly = true
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [ "javatests/src/org/chromium/mojo/MojoTestRule.java" ]
+  srcjar_deps = [ ":test_support_jni" ]
   deps = [
     "//base:base_java",
     "//base:jni_java",
@@ -85,7 +81,7 @@ source_set("test_support") {
   testonly = true
   sources = [ "javatests/mojo_test_rule.cc" ]
   deps = [
-    ":jni_headers",
+    ":test_support_jni",
     "//base",
     "//base/test:test_support",
     "//mojo/core/embedder",
@@ -93,6 +89,12 @@ source_set("test_support") {
   defines = [ "UNIT_TEST" ]
 }
 
+generate_jni("mojo_javatests_jni") {
+  testonly = true
+  sources =
+      [ "javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java" ]
+}
+
 android_library("mojo_javatests") {
   testonly = true
   sources = [
@@ -118,7 +120,7 @@ android_library("mojo_javatests") {
     "javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java",
     "javatests/src/org/chromium/mojo/system/impl/WatcherImplTest.java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+  srcjar_deps = [ ":mojo_javatests_jni" ]
 
   deps = [
     ":system_impl_java",
@@ -146,9 +148,8 @@ shared_library_with_jni("mojo_java_unittests") {
   ]
 
   deps = [
-    ":jni_headers",
+    ":mojo_javatests_jni",
     ":native_support",
-    ":system_impl_java_jni_headers",
     ":test_support",
     "//base",
     "//base/test:test_support",

mojo/public/java/system/javatests/mojo_test_rule.cc

@@ -12,7 +12,7 @@
 #include "base/task/single_thread_task_runner.h"
 #include "base/test/test_support_android.h"
 #include "mojo/core/embedder/embedder.h"
-#include "mojo/public/java/system/jni_headers/MojoTestRule_jni.h"
+#include "mojo/public/java/system/test_support_jni/MojoTestRule_jni.h"
 
 using base::android::JavaParamRef;
 

mojo/public/java/system/javatests/validation_test_util.cc

@@ -10,7 +10,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/test/test_support_android.h"
 #include "mojo/public/cpp/bindings/tests/validation_test_input_parser.h"
-#include "mojo/public/java/system/jni_headers/ValidationTestUtil_jni.h"
+#include "mojo/public/java/system/mojo_javatests_jni/ValidationTestUtil_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;

net/BUILD.gn

@@ -2344,16 +2344,6 @@ if (is_android) {
       "android/java/src/org/chromium/net/X509Util.java",
     ]
   }
-  generate_jni("net_test_jni_headers") {
-    testonly = true
-    sources = [
-      "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
-      "android/javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
-      "test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java",
-      "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
-      "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
-    ]
-  }
 }
 
 if (is_android || is_linux || is_chromeos) {
@@ -3210,12 +3200,15 @@ test("net_unittests") {
   if (is_android) {
     data_deps += [ "//net/tools/testserver:testserver_py" ]
     deps += [
-      ":net_test_jni_headers",
+      ":net_jni_headers",
       "//base:base_java_unittest_support",
       "//net/android:net_java",
       "//net/android:net_java_test_support",
-      "//net/android:net_java_test_support_provider",
-      "//net/android:net_javatests",
+      "//net/android:net_test_support_jni",
+      "//net/android:net_test_support_provider_java",
+      "//net/android:net_test_support_provider_jni",
+      "//net/android:net_tests_java",
+      "//net/android:net_tests_jni",
       "//net/android:net_unittests_apk_resources",
 
       # TODO(mmenke):  This depends on test_support_base, which depends on

net/android/BUILD.gn

@@ -38,10 +38,10 @@ android_library("net_java") {
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   srcjar_deps = [
     ":net_android_java_enums_srcjar",
     ":net_errors_java",
+    "//net:net_jni_headers",
   ]
   resources_package = "org.chromium.native_test"
 }
@@ -64,6 +64,11 @@ android_library("embedded_test_server_aidl_java") {
   srcjar_deps = [ ":embedded_test_server_aidl" ]
 }
 
+generate_jni("net_test_support_jni") {
+  testonly = true
+  sources = [ "../test/android/javatests/src/org/chromium/net/AndroidNetworkLibraryTestUtil.java" ]
+}
+
 android_library("net_java_test_support") {
   testonly = true
   sources = [
@@ -87,20 +92,31 @@ android_library("net_java_test_support") {
     "//third_party/androidx:androidx_test_uiautomator_uiautomator_java",
     "//third_party/junit",
   ]
-  srcjar_deps = [ ":net_java_test_support_enums_srcjar" ]
+  srcjar_deps = [
+    ":net_java_test_support_enums_srcjar",
+    ":net_test_support_jni",
+  ]
   mergeable_android_manifests =
       [ "../test/android/javatests/AndroidManifest_client.xml" ]
 }
 
-android_library("net_java_test_support_provider") {
+generate_jni("net_test_support_provider_jni") {
+  testonly = true
+  sources = [
+    "../test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
+    "../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
+  ]
+}
+
+android_library("net_test_support_provider_java") {
   testonly = true
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [
     "../test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
     "../test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticatorService.java",
     "../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java",
     "../test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerService.java",
   ]
+  srcjar_deps = [ ":net_test_support_provider_jni" ]
 
   deps = [
     ":embedded_test_server_aidl_java",
@@ -124,7 +140,7 @@ source_set("java_test_native_support") {
   ]
 
   deps = [ "//net:test_support" ]
-  public_deps = [ "//net:net_test_jni_headers" ]
+  public_deps = [ ":net_test_support_provider_jni" ]
 }
 
 shared_library_with_jni("net_java_test_native_support") {
@@ -152,7 +168,7 @@ android_apk("net_test_support_apk") {
 
   deps = [
     ":net_java_test_support",
-    ":net_java_test_support_provider",
+    ":net_test_support_provider_java",
   ]
   android_manifest = "../test/android/javatests/AndroidManifest.xml"
   apk_name = "ChromiumNetTestSupport"
@@ -172,7 +188,15 @@ android_resources("net_unittests_apk_resources") {
   ]
 }
 
-android_library("net_javatests") {
+generate_jni("net_tests_jni") {
+  testonly = true
+  sources = [
+    "javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
+    "javatests/src/org/chromium/net/AndroidProxyConfigServiceTestUtil.java",
+  ]
+}
+
+android_library("net_tests_java") {
   testonly = true
   sources = [
     "javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
@@ -188,6 +212,7 @@ android_library("net_javatests") {
     "javatests/src/org/chromium/net/ProxyChangeListenerTest.java",
     "javatests/src/org/chromium/net/X509UtilTest.java",
   ]
+  srcjar_deps = [ ":net_tests_jni" ]
   deps = [
     ":net_java",
     ":net_java_test_support",

net/android/dummy_spnego_authenticator.cc

@@ -5,7 +5,7 @@
 
 #include "base/android/jni_string.h"
 #include "base/base64.h"
-#include "net/net_test_jni_headers/DummySpnegoAuthenticator_jni.h"
+#include "net/android/net_test_support_provider_jni/DummySpnegoAuthenticator_jni.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::android::JavaParamRef;

net/proxy_resolution/proxy_config_service_android_unittest.cc

@@ -13,7 +13,7 @@
 #include "base/functional/callback_helpers.h"
 #include "base/run_loop.h"
 #include "base/task/single_thread_task_runner.h"
-#include "net/net_test_jni_headers/AndroidProxyConfigServiceTestUtil_jni.h"
+#include "net/android/net_tests_jni/AndroidProxyConfigServiceTestUtil_jni.h"
 #include "net/proxy_resolution/proxy_config_with_annotation.h"
 #include "net/proxy_resolution/proxy_info.h"
 #include "net/test/test_with_task_environment.h"

net/ssl/ssl_platform_key_android_unittest.cc

@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "net/android/keystore.h"
+#include "net/android/net_tests_jni/AndroidKeyStoreTestUtil_jni.h"
 #include "net/cert/x509_certificate.h"
-#include "net/net_test_jni_headers/AndroidKeyStoreTestUtil_jni.h"
 #include "net/ssl/ssl_private_key.h"
 #include "net/ssl/ssl_private_key_test_util.h"
 #include "net/test/cert_test_util.h"

net/test/embedded_test_server/android/embedded_test_server_android.cc

@@ -10,8 +10,8 @@
 #include "base/files/file_path.h"
 #include "base/functional/bind.h"
 #include "base/test/test_support_android.h"
+#include "net/android/net_test_support_provider_jni/EmbeddedTestServerImpl_jni.h"
 #include "net/base/tracing.h"
-#include "net/net_test_jni_headers/EmbeddedTestServerImpl_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::JavaRef;

net/url_request/url_request_http_job_unittest.cc

@@ -63,7 +63,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "base/android/jni_android.h"
-#include "net/net_test_jni_headers/AndroidNetworkLibraryTestUtil_jni.h"
+#include "net/android/net_test_support_jni/AndroidNetworkLibraryTestUtil_jni.h"
 #endif
 
 using net::test::IsError;

services/device/BUILD.gn

@@ -445,7 +445,6 @@ if (is_android) {
   generate_jni("device_service_jni_headers") {
     sources = [
       "android/java/src/org/chromium/services/device/InterfaceRegistrar.java",
-      "public/java/src/org/chromium/device/DeviceFeatureMap.java",
     ]
   }
 
@@ -464,6 +463,7 @@ if (is_android) {
     sources = [
       "android/java/src/org/chromium/services/device/InterfaceRegistrar.java",
     ]
+    srcjar_deps = [ ":device_service_jni_headers" ]
     deps = [
       "//base:jni_java",
       "//mojo/public/java:bindings_java",

services/device/public/cpp/BUILD.gn

@@ -23,7 +23,7 @@ if (is_android) {
       ":device_features",
       "//base",
       "//device/fido",
-      "//services/device:device_service_jni_headers",
+      "//services/device/public/java:device_feature_list_jni",
     ]
   }
 }

services/device/public/cpp/device_feature_map.cc

@@ -6,8 +6,8 @@
 #include "base/feature_list.h"
 #include "base/no_destructor.h"
 #include "device/fido/features.h"
-#include "services/device/device_service_jni_headers/DeviceFeatureMap_jni.h"
 #include "services/device/public/cpp/device_features.h"
+#include "services/device/public/java/device_feature_list_jni/DeviceFeatureMap_jni.h"
 
 namespace features {
 

services/device/public/java/BUILD.gn

@@ -4,17 +4,21 @@
 
 import("//build/config/android/rules.gni")
 
+generate_jni("device_feature_list_jni") {
+  sources = [ "src/org/chromium/device/DeviceFeatureMap.java" ]
+}
+
 android_library("device_feature_list_java") {
   sources = [
     "src/org/chromium/device/DeviceFeatureList.java",
     "src/org/chromium/device/DeviceFeatureMap.java",
   ]
+  srcjar_deps = [ ":device_feature_list_jni" ]
   deps = [
     "//base:base_java",
     "//base:jni_java",
     "//build/android:build_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 android_library("nfc_java") {

testing/android/native_test/BUILD.gn

@@ -15,7 +15,8 @@ source_set("native_test_support") {
     "native_test_util.h",
   ]
   deps = [
-    ":native_test_jni_headers",
+    ":native_main_runner_jni",
+    ":native_test_jni",
     "//base",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
@@ -29,7 +30,7 @@ source_set("native_browser_test_support") {
     "native_browser_test_support.cc",
     "native_browser_test_support.h",
   ]
-  deps = [ ":native_browser_test_jni_headers" ]
+  deps = [ ":native_test_jni" ]
   public_deps = [ "//base" ]
 }
 
@@ -43,16 +44,22 @@ source_set("native_test_native_code") {
   ]
 }
 
+generate_jni("native_main_runner_jni") {
+  testonly = true
+  sources = [ "java/src/org/chromium/native_test/MainRunner.java" ]
+}
+
 android_library("native_main_runner_java") {
   testonly = true
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+
+  srcjar_deps = [ ":native_main_runner_jni" ]
   sources = [ "java/src/org/chromium/native_test/MainRunner.java" ]
   deps = [ "//base:jni_java" ]
 }
 
 android_library("native_test_java") {
   testonly = true
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+
   deps = [
     ":native_main_runner_java",
     "//base:base_java",
@@ -63,6 +70,7 @@ android_library("native_test_java") {
     "//testing/android/reporter:reporter_java",
     "//third_party/androidx:androidx_fragment_fragment_java",
   ]
+  srcjar_deps = [ ":native_test_jni" ]
   sources = [
     "java/src/org/chromium/native_test/NativeBrowserTest.java",
     "java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
@@ -75,15 +83,10 @@ android_library("native_test_java") {
   ]
 }
 
-generate_jni("native_test_jni_headers") {
+generate_jni("native_test_jni") {
   testonly = true
   sources = [
-    "java/src/org/chromium/native_test/MainRunner.java",
+    "java/src/org/chromium/native_test/NativeBrowserTest.java",
     "java/src/org/chromium/native_test/NativeTest.java",
   ]
 }
-
-generate_jni("native_browser_test_jni_headers") {
-  testonly = true
-  sources = [ "java/src/org/chromium/native_test/NativeBrowserTest.java" ]
-}

testing/android/native_test/main_runner.cc

@@ -6,7 +6,7 @@
 
 #include "base/android/jni_array.h"
 #include "base/check.h"
-#include "testing/android/native_test/native_test_jni_headers/MainRunner_jni.h"
+#include "testing/android/native_test/native_main_runner_jni/MainRunner_jni.h"
 #include "testing/android/native_test/native_test_util.h"
 
 extern int main(int argc, char** argv);

testing/android/native_test/native_browser_test_support.cc

@@ -9,7 +9,7 @@
 // These markers are read by the test runner script to generate test results.
 // It installs signal handlers to detect crashes.
 
-#include "testing/android/native_test/native_browser_test_jni_headers/NativeBrowserTest_jni.h"
+#include "testing/android/native_test/native_test_jni/NativeBrowserTest_jni.h"
 
 namespace testing {
 namespace android {

testing/android/native_test/native_test_launcher.cc

@@ -30,7 +30,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "gtest/gtest.h"
 #include "testing/android/native_test/main_runner.h"
-#include "testing/android/native_test/native_test_jni_headers/NativeTest_jni.h"
+#include "testing/android/native_test/native_test_jni/NativeTest_jni.h"
 #include "testing/android/native_test/native_test_util.h"
 
 #if BUILDFLAG(CLANG_PROFILING)

ui/android/BUILD.gn

@@ -109,12 +109,18 @@ static_library("test_support") {
 generate_jni("ui_android_jni_headers") {
   sources = [
     "java/src/org/chromium/ui/OverscrollRefreshHandler.java",
+    "java/src/org/chromium/ui/base/Clipboard.java",
     "java/src/org/chromium/ui/base/EventForwarder.java",
+    "java/src/org/chromium/ui/base/LocalizationUtils.java",
+    "java/src/org/chromium/ui/base/SelectFileDialog.java",
     "java/src/org/chromium/ui/base/UiAndroidFeatureMap.java",
     "java/src/org/chromium/ui/base/ViewAndroidDelegate.java",
     "java/src/org/chromium/ui/base/WindowAndroid.java",
     "java/src/org/chromium/ui/display/DisplayAndroidManager.java",
     "java/src/org/chromium/ui/dragdrop/DropDataAndroid.java",
+    "java/src/org/chromium/ui/events/devices/InputDeviceObserver.java",
+    "java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
+    "java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
     "java/src/org/chromium/ui/resources/HandleViewResources.java",
     "java/src/org/chromium/ui/resources/ResourceFactory.java",
     "java/src/org/chromium/ui/resources/ResourceManager.java",
@@ -421,8 +427,11 @@ android_library("ui_no_recycler_view_java") {
     "//ui/base/ime/mojom:mojom_java",
     "//url:gurl_java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  srcjar_deps = [ ":java_enums_srcjar" ]
+
+  srcjar_deps = [
+    ":java_enums_srcjar",
+    ":ui_android_jni_headers",
+  ]
   resources_package = "org.chromium.ui"
 }
 
@@ -433,7 +442,6 @@ android_library("ui_recycler_view_java") {
     "java/src/org/chromium/ui/modelutil/SimpleRecyclerViewMcp.java",
     "java/src/org/chromium/ui/modelutil/SimpleRecyclerViewMcpBase.java",
   ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   deps = [
     ":ui_no_recycler_view_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
@@ -564,7 +572,6 @@ robolectric_binary("ui_junit_tests") {
     "junit/src/org/chromium/ui/widget/ViewRectProviderTest.java",
   ]
   deps = [
-    ":ui_android_jni_headers",
     ":ui_java",
     ":ui_java_test_support",
     ":ui_javatest_resources",
@@ -629,8 +636,8 @@ test("ui_android_unittests") {
 
 android_library("clipboard_java_test_support") {
   testonly = true
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
+  srcjar_deps = [ ":ui_javatest_jni_headers" ]
   sources =
       [ "javatests/src/org/chromium/ui/base/ClipboardAndroidTestSupport.java" ]
 

url/BUILD.gn

@@ -105,10 +105,11 @@ component("url") {
 
 if (is_android || is_robolectric) {
   generate_jni("url_jni_headers") {
-    sources = [
-      "android/java/src/org/chromium/url/IDNStringUtil.java",
-      "android/java/src/org/chromium/url/Origin.java",
-    ]
+    sources = [ "android/java/src/org/chromium/url/IDNStringUtil.java" ]
+  }
+
+  generate_jni("origin_jni_headers") {
+    sources = [ "android/java/src/org/chromium/url/Origin.java" ]
   }
 
   generate_jni("gurl_jni_headers") {
@@ -143,8 +144,8 @@ if (is_android || is_robolectric) {
 
     deps = [
       ":gurl_android",
+      ":origin_jni_headers",
       ":url",
-      ":url_jni_headers",
       "//base",
     ]
   }
@@ -159,6 +160,7 @@ if (is_android) {
 
 if (is_android && !is_cronet_build) {
   android_library("gurl_java") {
+    srcjar_deps = [ ":gurl_jni_headers" ]
     sources = [
       "android/java/src/org/chromium/url/GURL.java",
       "android/java/src/org/chromium/url/Parsed.java",
@@ -172,10 +174,10 @@ if (is_android && !is_cronet_build) {
       "//third_party/androidx:androidx_annotation_annotation_java",
       "//url/mojom:url_mojom_gurl_java",
     ]
-    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   }
 
   android_library("origin_java") {
+    srcjar_deps = [ ":origin_jni_headers" ]
     sources = [ "android/java/src/org/chromium/url/Origin.java" ]
     deps = [
       ":gurl_java",
@@ -185,7 +187,6 @@ if (is_android && !is_cronet_build) {
       "//mojo/public/mojom/base:base_java",
       "//url/mojom:url_mojom_origin_java",
     ]
-    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   }
 }
 
@@ -309,7 +310,8 @@ if (is_android && !is_cronet_build) {
 
   android_library("android_test_helper_java") {
     testonly = true
-    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+
+    srcjar_deps = [ ":j_test_jni_headers" ]
     sources = [
       "android/javatests/src/org/chromium/url/GURLJavaTestHelper.java",
       "android/javatests/src/org/chromium/url/OriginJavaTestHelper.java",
@@ -364,7 +366,6 @@ if (is_android && !is_cronet_build) {
       "//url/mojom:url_mojom_gurl_java",
       "//url/mojom:url_mojom_origin_java",
     ]
-    annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   }
 
   # See https://bugs.chromium.org/p/chromium/issues/detail?id=908819 for why we

url/android/origin_android.cc

@@ -11,7 +11,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/ptr_util.h"
 #include "url/android/gurl_android.h"
-#include "url/url_jni_headers/Origin_jni.h"
+#include "url/origin_jni_headers/Origin_jni.h"
 
 namespace url {
 

weblayer/BUILD.gn

@@ -773,6 +773,7 @@ source_set("weblayer_lib_base") {
       "//services/resource_coordinator/public/cpp/memory_instrumentation:browser",
       "//ui/android",
       "//url:gurl_android",
+      "//weblayer/browser/java:base_module_jni",
       "//weblayer/browser/java:jni",
     ]
 

weblayer/browser/android/application_info_helper.cc

@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "weblayer/browser/java/jni/ApplicationInfoHelper_jni.h"
+#include "weblayer/browser/java/base_module_jni/ApplicationInfoHelper_jni.h"
 
 namespace weblayer {
 

weblayer/browser/java/BUILD.gn

@@ -79,11 +79,16 @@ java_cpp_enum("generated_enums") {
   ]
 }
 
+generate_jni("base_module_jni") {
+  sources = [ "org/chromium/weblayer_private/ApplicationInfoHelper.java" ]
+}
+
 android_library("base_module_java") {
   sources = [
     "org/chromium/weblayer_private/ApplicationInfoHelper.java",
     "org/chromium/weblayer_private/ChildProcessServiceImpl.java",
   ]
+  srcjar_deps = [ ":base_module_jni" ]
   deps = [
     ":base_module_interfaces_java",
     "$google_play_services_package:google_play_services_basement_java",
@@ -95,8 +100,6 @@ android_library("base_module_java") {
     "//content/public/android:content_java",
   ]
 
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-
   # Needed for android.webkit.WebViewFactory
   alternative_android_sdk_dep =
       "//third_party/android_sdk:public_framework_system_java"
@@ -308,11 +311,11 @@ android_library("java") {
 
   srcjar_deps = [
     ":generated_enums",
+    ":jni",
     ":resource_id_javagen",
     ":weblayer_product_config",
   ]
   jar_excluded_patterns = [ "*/ProductConfig.class" ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 
   # Needed for android.webkit.WebView(Delegate|Factory)
   alternative_android_sdk_dep =
@@ -341,6 +344,10 @@ android_library("test_java") {
     "org/chromium/weblayer_private/test/TestInfoBar.java",
     "org/chromium/weblayer_private/test/TestWebLayerImpl.java",
   ]
+  srcjar_deps = [
+    ":test_aidl",
+    ":test_jni",
+  ]
   resources_package = "org.chromium.weblayer_private.test"
   deps = [
     ":base_module_interfaces_java",
@@ -370,8 +377,6 @@ android_library("test_java") {
     "//ui/android:ui_full_java",
     "//url:origin_java",
   ]
-  srcjar_deps = [ ":test_aidl" ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 robolectric_library("junit_test_support") {
@@ -440,7 +445,6 @@ generate_jni("test_jni") {
 
 generate_jni("jni") {
   sources = [
-    "org/chromium/weblayer_private/ApplicationInfoHelper.java",
     "org/chromium/weblayer_private/AutocompleteSchemeClassifierImpl.java",
     "org/chromium/weblayer_private/BrowserFragmentImpl.java",
     "org/chromium/weblayer_private/BrowserImpl.java",