[AW] Reorganize //aw/BUILD.gn

This CL reorganizes //aw/BUILD.gn to group things as follows:
 * Public targets (targets used by monochrome, shared libraries, apks)
 * Java rules (JNI, android_libraries, aidl)
 * Resource rules

Test: ninja -C out/aw
Bug: 934152
Change-Id: Id5a21048d3353ff77f090c13e04d2c410b69e925
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1933314
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719362}

android_webview/BUILD.gn

@@ -23,6 +23,98 @@ if (enable_resource_whitelist_generation) {
       "$target_gen_dir/system_webview_pak_whitelist.txt"
 }
 
+if (public_android_sdk) {
+  system_webview_apk_tmpl("system_webview_apk") {
+    android_manifest = system_webview_android_manifest
+    android_manifest_dep =
+        "//android_webview/nonembedded:system_webview_manifest"
+    deps = upstream_only_webview_deps
+    apk_name = "SystemWebView"
+    min_sdk_version = 21
+  }
+
+  android_resource_sizes_test("resource_sizes_system_webview_apk") {
+    apk_name = "SystemWebView"
+    data_deps = [
+      ":system_webview_apk",
+    ]
+  }
+
+  system_webview_apk_tmpl("trichrome_webview_apk") {
+    android_manifest = trichrome_webview_android_manifest
+    android_manifest_dep =
+        "//android_webview/nonembedded:trichrome_webview_manifest"
+    min_sdk_version = 29
+
+    deps = upstream_only_webview_deps
+    apk_name = "TrichromeWebView"
+    use_trichrome_library = true
+    uncompress_dex = true
+    if (trichrome_synchronized_proguard) {
+      static_library_provider = "//chrome/android:trichrome_library_apk"
+    }
+  }
+
+  if (android_64bit_target_cpu) {
+    system_webview_apk_tmpl("trichrome_webview_64_32_apk") {
+      android_manifest = trichrome_webview_64_32_android_manifest
+      android_manifest_dep =
+          "//android_webview/nonembedded:trichrome_webview_64_32_manifest"
+      is_64_bit_browser = true
+      min_sdk_version = 29
+
+      deps = upstream_only_webview_deps
+      apk_name = "TrichromeWebView6432"
+      use_trichrome_library = true
+      uncompress_dex = true
+      if (trichrome_synchronized_proguard) {
+        static_library_provider = "//chrome/android:trichrome_library_apk"
+      }
+    }
+  }
+}
+
+shared_library("libwebviewchromium") {
+  deps = [
+    "//android_webview/lib:webview_entry_point",
+    "//android_webview/nonembedded",
+  ]
+  configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+  configs += [ "//build/config/android:hide_all_but_jni" ]
+}
+
+template("webview_library") {
+  chrome_common_shared_library(target_name) {
+    forward_variables_from(invoker, "*")
+    deps = [
+      "//android_webview/lib:webview_entry_point",
+      "//android_webview/nonembedded",
+    ]
+    is_webview = true
+  }
+}
+
+if (defined(android_secondary_abi_toolchain)) {
+  # Note here that on a given system, the webview-only library needs the same
+  # library name as the browser library, since the system webview factory will
+  # differentiate only by ABI.
+  if (current_toolchain == android_secondary_abi_toolchain) {
+    # This target is the 32-bit WebView library that pairs with a 64-bit
+    # browser. It is suffixed with _64 because its name must match the 64-bit
+    # browser library.
+    webview_library("monochrome_64") {
+    }
+  } else {
+    # Inverse of above, for the original 32-bit case.
+    webview_library("monochrome") {
+    }
+  }
+} else {
+  # 32-bit WebView library used in 32-bit only builds of 64/32 targets.
+  webview_library("monochrome_64") {
+  }
+}
+
 group("android_webview") {
   if (public_android_sdk) {
     deps = [
@@ -31,6 +123,12 @@ group("android_webview") {
   }
 }
 
+java_group("android_webview_java") {
+  deps = [
+    ":browser_java",
+  ]
+}
+
 generate_jni("common_jni_headers") {
   sources = [
     "java/src/org/chromium/android_webview/common/AwResource.java",
@@ -95,21 +193,289 @@ group("system_webview_manifest") {
   ]
 }
 
-webview_repack_locales("repack_locales") {
-  input_locales = locales
-  output_locales = locales
+android_library("browser_java") {
+  java_files = [
+    "java/src/org/chromium/android_webview/AndroidProtocolHandler.java",
+    "java/src/org/chromium/android_webview/AutofillActionModeCallback.java",
+    "java/src/org/chromium/android_webview/AwActionModeCallback.java",
+    "java/src/org/chromium/android_webview/AwAutofillClient.java",
+    "java/src/org/chromium/android_webview/AwAutofillManager.java",
+    "java/src/org/chromium/android_webview/AwAutofillProvider.java",
+    "java/src/org/chromium/android_webview/AwAutofillUMA.java",
+    "java/src/org/chromium/android_webview/AwBrowserContext.java",
+    "java/src/org/chromium/android_webview/AwBrowserProcess.java",
+    "java/src/org/chromium/android_webview/AwConsoleMessage.java",
+    "java/src/org/chromium/android_webview/AwContents.java",
+    "java/src/org/chromium/android_webview/AwContentsBackgroundThreadClient.java",
+    "java/src/org/chromium/android_webview/AwContentsClient.java",
+    "java/src/org/chromium/android_webview/AwContentsClientBridge.java",
+    "java/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java",
+    "java/src/org/chromium/android_webview/AwContentsIoThreadClient.java",
+    "java/src/org/chromium/android_webview/AwContentsLifecycleNotifier.java",
+    "java/src/org/chromium/android_webview/AwContentsStatics.java",
+    "java/src/org/chromium/android_webview/AwCookieManager.java",
+    "java/src/org/chromium/android_webview/AwDebug.java",
+    "java/src/org/chromium/android_webview/AwDevToolsServer.java",
+    "java/src/org/chromium/android_webview/AwFeatures.java",
+    "java/src/org/chromium/android_webview/AwFeatureList.java",
+    "java/src/org/chromium/android_webview/AwFirebaseConfig.java",
+    "java/src/org/chromium/android_webview/AwFormDatabase.java",
+    "java/src/org/chromium/android_webview/AwGeolocationPermissions.java",
+    "java/src/org/chromium/android_webview/AwHistogramRecorder.java",
+    "java/src/org/chromium/android_webview/AwHttpAuthHandler.java",
+    "java/src/org/chromium/android_webview/AwLayoutSizer.java",
+    "java/src/org/chromium/android_webview/AwNetworkChangeNotifierRegistrationPolicy.java",
+    "java/src/org/chromium/android_webview/AwPdfExporter.java",
+    "java/src/org/chromium/android_webview/AwPrintDocumentAdapter.java",
+    "java/src/org/chromium/android_webview/AwProxyController.java",
+    "java/src/org/chromium/android_webview/AwQuotaManagerBridge.java",
+    "java/src/org/chromium/android_webview/AwRenderProcess.java",
+    "java/src/org/chromium/android_webview/AwRenderProcessGoneDetail.java",
+    "java/src/org/chromium/android_webview/AwScrollOffsetManager.java",
+    "java/src/org/chromium/android_webview/AwServiceWorkerClient.java",
+    "java/src/org/chromium/android_webview/AwServiceWorkerController.java",
+    "java/src/org/chromium/android_webview/AwServiceWorkerSettings.java",
+    "java/src/org/chromium/android_webview/AwSettings.java",
+    "java/src/org/chromium/android_webview/AwSupportLibIsomorphic.java",
+    "java/src/org/chromium/android_webview/AwSwitches.java",
+    "java/src/org/chromium/android_webview/AwTracingController.java",
+    "java/src/org/chromium/android_webview/AwVariationsSeedBridge.java",
+    "java/src/org/chromium/android_webview/AwViewAndroidDelegate.java",
+    "java/src/org/chromium/android_webview/AwViewMethods.java",
+    "java/src/org/chromium/android_webview/AwWebContentsDelegate.java",
+    "java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java",
+    "java/src/org/chromium/android_webview/AwWebContentsObserver.java",
+    "java/src/org/chromium/android_webview/AwWebResourceInterceptResponse.java",
+    "java/src/org/chromium/android_webview/AwWebResourceResponse.java",
+    "java/src/org/chromium/android_webview/AwZoomControls.java",
+    "java/src/org/chromium/android_webview/CleanupReference.java",
+    "java/src/org/chromium/android_webview/ClientCertLookupTable.java",
+    "java/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java",
+    "java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java",
+    "java/src/org/chromium/android_webview/FindAddress.java",
+    "java/src/org/chromium/android_webview/FullScreenView.java",
+    "java/src/org/chromium/android_webview/HttpAuthDatabase.java",
+    "java/src/org/chromium/android_webview/InputStreamUtil.java",
+    "java/src/org/chromium/android_webview/JsPromptResultReceiver.java",
+    "java/src/org/chromium/android_webview/JsReplyProxy.java",
+    "java/src/org/chromium/android_webview/JsResultHandler.java",
+    "java/src/org/chromium/android_webview/JsResultReceiver.java",
+    "java/src/org/chromium/android_webview/NullAwViewMethods.java",
+    "java/src/org/chromium/android_webview/OverScrollGlow.java",
+    "java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java",
+    "java/src/org/chromium/android_webview/ScrollAccessibilityHelper.java",
+    "java/src/org/chromium/android_webview/SslUtil.java",
+    "java/src/org/chromium/android_webview/VariationsSeedLoader.java",
+    "java/src/org/chromium/android_webview/ViewPositionObserver.java",
+    "java/src/org/chromium/android_webview/WebMessageListener.java",
+    "java/src/org/chromium/android_webview/WebMessageListenerHolder.java",
+    "java/src/org/chromium/android_webview/WebViewChromiumRunQueue.java",
+    "java/src/org/chromium/android_webview/gfx/AwDrawFnImpl.java",
+    "java/src/org/chromium/android_webview/gfx/AwFunctor.java",
+    "java/src/org/chromium/android_webview/gfx/AwGLFunctor.java",
+    "java/src/org/chromium/android_webview/gfx/AwPicture.java",
+    "java/src/org/chromium/android_webview/gfx/JavaBrowserViewRendererHelper.java",
+    "java/src/org/chromium/android_webview/metrics/AwMetricsLogUploader.java",
+    "java/src/org/chromium/android_webview/metrics/AwMetricsServiceClient.java",
+    "java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConfigHelper.java",
+    "java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConversionHelper.java",
+    "java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingResponse.java",
+    "java/src/org/chromium/android_webview/permission/AwGeolocationCallback.java",
+    "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
+    "java/src/org/chromium/android_webview/policy/AwPolicyProvider.java",
+  ]
+  deps = [
+    ":common_aidl_java",
+    ":common_commandline_java",
+    ":common_crash_java",
 
-  if (enable_resource_whitelist_generation) {
-    repack_whitelist = system_webview_pak_whitelist
-    deps = [
-      ":system_webview_pak_whitelist",
+    # This includes AwResource, which may be called via JNI. We're including it
+    # here because there's currently no good way to enforce that it gets included
+    # when it's depended on via JNI.
+    ":common_java",
+    ":common_platform_services_java",
+    ":common_variations_utils_java",
+    ":resources",
+    "//android_webview/nonembedded:system_webview_manifest",
+    "//base:base_java",
+    "//base:jni_java",
+    "//components/autofill/android:autofill_java",
+    "//components/autofill/android:provider_java",
+    "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
+    "//components/content_capture/android:java",
+    "//components/crash/android:handler_java",
+    "//components/crash/android:java",
+    "//components/embedder_support/android:web_contents_delegate_java",
+    "//components/minidump_uploader:minidump_uploader_java",
+    "//components/navigation_interception/android:navigation_interception_java",
+    "//components/policy/android:policy_java",
+    "//components/safe_browsing/android:safe_browsing_java",
+    "//components/variations:load_seed_result_enum_java",
+    "//components/variations/android:variations_java",
+    "//components/version_info/android:version_constants_java",
+    "//components/viz/common:common_java",
+    "//content/public/android:content_java",
+    "//device/gamepad:java",
+    "//mojo/public/java:system_java",
+    "//mojo/public/java/system:system_impl_java",
+    "//net/android:net_java",
+    "//services/network/public/mojom:mojom_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/blink/public:blink_headers_java",
+    "//ui/android:ui_java",
+  ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+
+  if (enable_spellcheck) {
+    deps += [ "//components/spellcheck/browser/android:java" ]
+  }
+
+  if (webview_includes_weblayer) {
+    deps += [
+      "//components/viz/service:service_java",
+      "//weblayer/browser/java",
     ]
   }
+
+  srcjar_deps = [
+    "//android_webview/browser:browser_enums",
+    "//components/safe_browsing/db:sb_threat_values",
+  ]
+
+  android_manifest_for_lint = system_webview_android_manifest
+  min_sdk_version = 21
 }
 
-android_assets("locale_pak_assets") {
-  disable_compression = true
-  renaming_sources = []
+android_library("common_variations_utils_java") {
+  java_files = [ "java/src/org/chromium/android_webview/common/variations/VariationsUtils.java" ]
+  deps = [
+    "//android_webview/proto:aw_variations_seed_proto_java",
+    "//base:base_java",
+    "//components/variations/android:variations_java",
+    "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
+  ]
+}
+
+# Separate target to allow for a dependency on GmsCore without pulling in all of
+# android_webview_java. It compiles the abstract class; implementations are
+# compiled separately.
+android_library("common_platform_services_java") {
+  java_files = [
+    "java/src/org/chromium/android_webview/common/PlatformServiceBridge.java",
+    "java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java",
+  ]
+
+  deps = [
+    "//base:base_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+  ]
+
+  # The appropriate .class file will be loaded via a dependency to a library
+  # like :platform_service_bridge_upstream_implementation_java below. We only include the
+  # .java file because other files in the target depend on it.
+  jar_excluded_patterns = [ "*/PlatformServiceBridgeImpl.class" ]
+}
+
+# This target compiles the implementation of PlatformServiceBridge for AOSP targets.
+android_library("platform_service_bridge_upstream_implementation_java") {
+  java_files = [ "java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java" ]
+  deps = [
+    ":common_platform_services_java",
+  ]
+}
+
+android_library("common_crash_java") {
+  java_files = [
+    "java/src/org/chromium/android_webview/common/crash/AwCrashReporterClient.java",
+    "java/src/org/chromium/android_webview/common/crash/CrashInfo.java",
+    "java/src/org/chromium/android_webview/common/crash/SystemWideCrashDirectories.java",
+  ]
+
+  deps = [
+    "//base:base_java",
+    "//base:jni_java",
+  ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}
+
+android_library("common_java") {
+  java_files = [
+    "java/src/org/chromium/android_webview/common/AwResource.java",
+    "java/src/org/chromium/android_webview/common/Flag.java",
+    "java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java",
+    "java/src/org/chromium/android_webview/common/services/ServiceNames.java",
+  ]
+  deps = [
+    "//base:base_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
+  ]
+}
+
+android_library("common_commandline_java") {
+  java_files =
+      [ "java/src/org/chromium/android_webview/common/CommandLineUtil.java" ]
+
+  deps = [
+    "//base:base_java",
+  ]
+}
+
+android_aidl("common_aidl") {
+  import_include = [ "java/src" ]
+  sources = [
+    "java/src/org/chromium/android_webview/common/services/ICrashReceiverService.aidl",
+    "java/src/org/chromium/android_webview/common/services/IDeveloperUiService.aidl",
+    "java/src/org/chromium/android_webview/common/services/IVariationsSeedServer.aidl",
+  ]
+}
+
+android_library("common_aidl_java") {
+  srcjar_deps = [ ":common_aidl" ]
+}
+
+# Generate ProductConfig.java so that android_webview_product_config_java's
+# compile step works.
+generate_product_config_srcjar("webview_product_config") {
+  java_package = webview_product_config_java_package
+}
+
+# ProductConfig.java is excluded from the generated .jar
+# (via. jar_excluded_patterns) and the final version is inserted at the APK
+# level - with the list of pak locales populated by looking at the assets that
+# are listed in the final APK's .build_config.
+android_library("android_webview_product_config_java") {
+  java_files = [ "java/src/org/chromium/android_webview/AwLocaleConfig.java" ]
+  srcjar_deps = [ ":webview_product_config" ]
+  jar_excluded_patterns = [ "*/ProductConfig.class" ]
+}
+
+if (enable_resource_whitelist_generation) {
+  generate_resource_whitelist("system_webview_pak_whitelist") {
+    deps = [
+      ":libwebviewchromium",
+    ]
+    inputs = [
+      "$root_out_dir/lib.unstripped/libwebviewchromium$shlib_extension",
+    ]
+    output = system_webview_pak_whitelist
+  }
+}
+
+webview_repack_locales("repack_locales") {
+  input_locales = locales
+  output_locales = locales
+
+  if (enable_resource_whitelist_generation) {
+    repack_whitelist = system_webview_pak_whitelist
+    deps = [
+      ":system_webview_pak_whitelist",
+    ]
+  }
+}
+
+android_assets("locale_pak_assets") {
+  disable_compression = true
+  renaming_sources = []
   renaming_destinations = []
   foreach(_locale, locales) {
     renaming_sources += [ "$root_out_dir/android_webview/locales/$_locale.pak" ]
@@ -184,6 +550,28 @@ android_assets("pak_file_assets") {
   disable_compression = true
 }
 
+if (android_64bit_target_cpu) {
+  android_assets("v8_snapshot_secondary_abi_assets") {
+    _secondary_abi_out_dir =
+        get_label_info("//v8($android_secondary_abi_toolchain)", "root_out_dir")
+    assert(android_64bit_target_cpu,
+           "32-bit targets shouldn't have secondary abi")
+    arch_suffix = "32"
+    if (use_v8_context_snapshot) {
+      renaming_sources = [ "$_secondary_abi_out_dir/v8_context_snapshot.bin" ]
+      renaming_destinations = [ "v8_context_snapshot_$arch_suffix.bin" ]
+    } else {
+      renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ]
+      renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ]
+    }
+    disable_compression = true
+    deps = [
+      "//tools/v8_context_snapshot($android_secondary_abi_toolchain)",
+      "//v8($android_secondary_abi_toolchain)",
+    ]
+  }
+}
+
 # These assets are needed by both monochrome and stand alone WebView, but not by
 # Chrome or TrichromeWebView.
 android_assets("monochrome_webview_assets") {
@@ -394,449 +782,61 @@ grit("generate_components_strings") {
   }
 }
 
-shared_library("libwebviewchromium") {
-  deps = [
-    "//android_webview/lib:webview_entry_point",
-    "//android_webview/nonembedded",
+java_strings_grd("strings_grd") {
+  grd_file = "java/strings/android_webview_strings.grd"
+  outputs = [
+    "values-am/android_webview_strings.xml",
+    "values-ar/android_webview_strings.xml",
+    "values-bg/android_webview_strings.xml",
+    "values-bn/android_webview_strings.xml",
+    "values-ca/android_webview_strings.xml",
+    "values-cs/android_webview_strings.xml",
+    "values-da/android_webview_strings.xml",
+    "values-de/android_webview_strings.xml",
+    "values-el/android_webview_strings.xml",
+    "values-en-rGB/android_webview_strings.xml",
+    "values-es/android_webview_strings.xml",
+    "values-es-rUS/android_webview_strings.xml",
+    "values-et/android_webview_strings.xml",
+    "values-fa/android_webview_strings.xml",
+    "values-fi/android_webview_strings.xml",
+    "values-fr/android_webview_strings.xml",
+    "values-gu/android_webview_strings.xml",
+    "values-hi/android_webview_strings.xml",
+    "values-hr/android_webview_strings.xml",
+    "values-hu/android_webview_strings.xml",
+    "values-in/android_webview_strings.xml",
+    "values-it/android_webview_strings.xml",
+    "values-iw/android_webview_strings.xml",
+    "values-ja/android_webview_strings.xml",
+    "values-kn/android_webview_strings.xml",
+    "values-ko/android_webview_strings.xml",
+    "values-lt/android_webview_strings.xml",
+    "values-lv/android_webview_strings.xml",
+    "values-ml/android_webview_strings.xml",
+    "values-mr/android_webview_strings.xml",
+    "values-ms/android_webview_strings.xml",
+    "values-nb/android_webview_strings.xml",
+    "values-nl/android_webview_strings.xml",
+    "values-pl/android_webview_strings.xml",
+    "values-pt-rBR/android_webview_strings.xml",
+    "values-pt-rPT/android_webview_strings.xml",
+    "values-ro/android_webview_strings.xml",
+    "values-ru/android_webview_strings.xml",
+    "values-sk/android_webview_strings.xml",
+    "values-sl/android_webview_strings.xml",
+    "values-sr/android_webview_strings.xml",
+    "values-sv/android_webview_strings.xml",
+    "values-sw/android_webview_strings.xml",
+    "values-ta/android_webview_strings.xml",
+    "values-te/android_webview_strings.xml",
+    "values-th/android_webview_strings.xml",
+    "values-tl/android_webview_strings.xml",
+    "values-tr/android_webview_strings.xml",
+    "values-uk/android_webview_strings.xml",
+    "values-vi/android_webview_strings.xml",
+    "values-zh-rCN/android_webview_strings.xml",
+    "values-zh-rTW/android_webview_strings.xml",
+    "values/android_webview_strings.xml",
   ]
-  configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
-  configs += [ "//build/config/android:hide_all_but_jni" ]
-}
-
-if (android_64bit_target_cpu) {
-  android_assets("v8_snapshot_secondary_abi_assets") {
-    _secondary_abi_out_dir =
-        get_label_info("//v8($android_secondary_abi_toolchain)", "root_out_dir")
-    assert(android_64bit_target_cpu,
-           "32-bit targets shouldn't have secondary abi")
-    arch_suffix = "32"
-    if (use_v8_context_snapshot) {
-      renaming_sources = [ "$_secondary_abi_out_dir/v8_context_snapshot.bin" ]
-      renaming_destinations = [ "v8_context_snapshot_$arch_suffix.bin" ]
-    } else {
-      renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ]
-      renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ]
-    }
-    disable_compression = true
-    deps = [
-      "//tools/v8_context_snapshot($android_secondary_abi_toolchain)",
-      "//v8($android_secondary_abi_toolchain)",
-    ]
-  }
-}
-
-template("webview_library") {
-  chrome_common_shared_library(target_name) {
-    forward_variables_from(invoker, "*")
-    deps = [
-      "//android_webview/lib:webview_entry_point",
-      "//android_webview/nonembedded",
-    ]
-    is_webview = true
-  }
-}
-
-if (defined(android_secondary_abi_toolchain)) {
-  # Note here that on a given system, the webview-only library needs the same
-  # library name as the browser library, since the system webview factory will
-  # differentiate only by ABI.
-  if (current_toolchain == android_secondary_abi_toolchain) {
-    # This target is the 32-bit WebView library that pairs with a 64-bit
-    # browser. It is suffixed with _64 because its name must match the 64-bit
-    # browser library.
-    webview_library("monochrome_64") {
-    }
-  } else {
-    # Inverse of above, for the original 32-bit case.
-    webview_library("monochrome") {
-    }
-  }
-} else {
-  # 32-bit WebView library used in 32-bit only builds of 64/32 targets.
-  webview_library("monochrome_64") {
-  }
-}
-
-if (enable_resource_whitelist_generation) {
-  generate_resource_whitelist("system_webview_pak_whitelist") {
-    deps = [
-      ":libwebviewchromium",
-    ]
-    inputs = [
-      "$root_out_dir/lib.unstripped/libwebviewchromium$shlib_extension",
-    ]
-    output = system_webview_pak_whitelist
-  }
-}
-
-java_group("android_webview_java") {
-  deps = [
-    ":browser_java",
-  ]
-}
-
-android_library("browser_java") {
-  java_files = [
-    "java/src/org/chromium/android_webview/AndroidProtocolHandler.java",
-    "java/src/org/chromium/android_webview/AutofillActionModeCallback.java",
-    "java/src/org/chromium/android_webview/AwActionModeCallback.java",
-    "java/src/org/chromium/android_webview/AwAutofillClient.java",
-    "java/src/org/chromium/android_webview/AwAutofillManager.java",
-    "java/src/org/chromium/android_webview/AwAutofillProvider.java",
-    "java/src/org/chromium/android_webview/AwAutofillUMA.java",
-    "java/src/org/chromium/android_webview/AwBrowserContext.java",
-    "java/src/org/chromium/android_webview/AwBrowserProcess.java",
-    "java/src/org/chromium/android_webview/AwConsoleMessage.java",
-    "java/src/org/chromium/android_webview/AwContents.java",
-    "java/src/org/chromium/android_webview/AwContentsBackgroundThreadClient.java",
-    "java/src/org/chromium/android_webview/AwContentsClient.java",
-    "java/src/org/chromium/android_webview/AwContentsClientBridge.java",
-    "java/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java",
-    "java/src/org/chromium/android_webview/AwContentsIoThreadClient.java",
-    "java/src/org/chromium/android_webview/AwContentsLifecycleNotifier.java",
-    "java/src/org/chromium/android_webview/AwContentsStatics.java",
-    "java/src/org/chromium/android_webview/AwCookieManager.java",
-    "java/src/org/chromium/android_webview/AwDebug.java",
-    "java/src/org/chromium/android_webview/AwDevToolsServer.java",
-    "java/src/org/chromium/android_webview/AwFeatures.java",
-    "java/src/org/chromium/android_webview/AwFeatureList.java",
-    "java/src/org/chromium/android_webview/AwFirebaseConfig.java",
-    "java/src/org/chromium/android_webview/AwFormDatabase.java",
-    "java/src/org/chromium/android_webview/AwGeolocationPermissions.java",
-    "java/src/org/chromium/android_webview/AwHistogramRecorder.java",
-    "java/src/org/chromium/android_webview/AwHttpAuthHandler.java",
-    "java/src/org/chromium/android_webview/AwLayoutSizer.java",
-    "java/src/org/chromium/android_webview/AwNetworkChangeNotifierRegistrationPolicy.java",
-    "java/src/org/chromium/android_webview/AwPdfExporter.java",
-    "java/src/org/chromium/android_webview/AwPrintDocumentAdapter.java",
-    "java/src/org/chromium/android_webview/AwProxyController.java",
-    "java/src/org/chromium/android_webview/AwQuotaManagerBridge.java",
-    "java/src/org/chromium/android_webview/AwRenderProcess.java",
-    "java/src/org/chromium/android_webview/AwRenderProcessGoneDetail.java",
-    "java/src/org/chromium/android_webview/AwScrollOffsetManager.java",
-    "java/src/org/chromium/android_webview/AwServiceWorkerClient.java",
-    "java/src/org/chromium/android_webview/AwServiceWorkerController.java",
-    "java/src/org/chromium/android_webview/AwServiceWorkerSettings.java",
-    "java/src/org/chromium/android_webview/AwSettings.java",
-    "java/src/org/chromium/android_webview/AwSupportLibIsomorphic.java",
-    "java/src/org/chromium/android_webview/AwSwitches.java",
-    "java/src/org/chromium/android_webview/AwTracingController.java",
-    "java/src/org/chromium/android_webview/AwVariationsSeedBridge.java",
-    "java/src/org/chromium/android_webview/AwViewAndroidDelegate.java",
-    "java/src/org/chromium/android_webview/AwViewMethods.java",
-    "java/src/org/chromium/android_webview/AwWebContentsDelegate.java",
-    "java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java",
-    "java/src/org/chromium/android_webview/AwWebContentsObserver.java",
-    "java/src/org/chromium/android_webview/AwWebResourceInterceptResponse.java",
-    "java/src/org/chromium/android_webview/AwWebResourceResponse.java",
-    "java/src/org/chromium/android_webview/AwZoomControls.java",
-    "java/src/org/chromium/android_webview/CleanupReference.java",
-    "java/src/org/chromium/android_webview/ClientCertLookupTable.java",
-    "java/src/org/chromium/android_webview/DefaultVideoPosterRequestHandler.java",
-    "java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java",
-    "java/src/org/chromium/android_webview/FindAddress.java",
-    "java/src/org/chromium/android_webview/FullScreenView.java",
-    "java/src/org/chromium/android_webview/HttpAuthDatabase.java",
-    "java/src/org/chromium/android_webview/InputStreamUtil.java",
-    "java/src/org/chromium/android_webview/JsPromptResultReceiver.java",
-    "java/src/org/chromium/android_webview/JsReplyProxy.java",
-    "java/src/org/chromium/android_webview/JsResultHandler.java",
-    "java/src/org/chromium/android_webview/JsResultReceiver.java",
-    "java/src/org/chromium/android_webview/NullAwViewMethods.java",
-    "java/src/org/chromium/android_webview/OverScrollGlow.java",
-    "java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java",
-    "java/src/org/chromium/android_webview/ScrollAccessibilityHelper.java",
-    "java/src/org/chromium/android_webview/SslUtil.java",
-    "java/src/org/chromium/android_webview/VariationsSeedLoader.java",
-    "java/src/org/chromium/android_webview/ViewPositionObserver.java",
-    "java/src/org/chromium/android_webview/WebMessageListener.java",
-    "java/src/org/chromium/android_webview/WebMessageListenerHolder.java",
-    "java/src/org/chromium/android_webview/WebViewChromiumRunQueue.java",
-    "java/src/org/chromium/android_webview/gfx/AwDrawFnImpl.java",
-    "java/src/org/chromium/android_webview/gfx/AwFunctor.java",
-    "java/src/org/chromium/android_webview/gfx/AwGLFunctor.java",
-    "java/src/org/chromium/android_webview/gfx/AwPicture.java",
-    "java/src/org/chromium/android_webview/gfx/JavaBrowserViewRendererHelper.java",
-    "java/src/org/chromium/android_webview/metrics/AwMetricsLogUploader.java",
-    "java/src/org/chromium/android_webview/metrics/AwMetricsServiceClient.java",
-    "java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConfigHelper.java",
-    "java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConversionHelper.java",
-    "java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingResponse.java",
-    "java/src/org/chromium/android_webview/permission/AwGeolocationCallback.java",
-    "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
-    "java/src/org/chromium/android_webview/policy/AwPolicyProvider.java",
-  ]
-  deps = [
-    ":common_aidl_java",
-    ":common_commandline_java",
-    ":common_crash_java",
-
-    # This includes AwResource, which may be called via JNI. We're including it
-    # here because there's currently no good way to enforce that it gets included
-    # when it's depended on via JNI.
-    ":common_java",
-    ":common_platform_services_java",
-    ":common_variations_utils_java",
-    ":resources",
-    "//android_webview/nonembedded:system_webview_manifest",
-    "//base:base_java",
-    "//base:jni_java",
-    "//components/autofill/android:autofill_java",
-    "//components/autofill/android:provider_java",
-    "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
-    "//components/content_capture/android:java",
-    "//components/crash/android:handler_java",
-    "//components/crash/android:java",
-    "//components/embedder_support/android:web_contents_delegate_java",
-    "//components/minidump_uploader:minidump_uploader_java",
-    "//components/navigation_interception/android:navigation_interception_java",
-    "//components/policy/android:policy_java",
-    "//components/safe_browsing/android:safe_browsing_java",
-    "//components/variations:load_seed_result_enum_java",
-    "//components/variations/android:variations_java",
-    "//components/version_info/android:version_constants_java",
-    "//components/viz/common:common_java",
-    "//content/public/android:content_java",
-    "//device/gamepad:java",
-    "//mojo/public/java:system_java",
-    "//mojo/public/java/system:system_impl_java",
-    "//net/android:net_java",
-    "//services/network/public/mojom:mojom_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/blink/public:blink_headers_java",
-    "//ui/android:ui_java",
-  ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-
-  if (enable_spellcheck) {
-    deps += [ "//components/spellcheck/browser/android:java" ]
-  }
-
-  if (webview_includes_weblayer) {
-    deps += [
-      "//components/viz/service:service_java",
-      "//weblayer/browser/java",
-    ]
-  }
-
-  srcjar_deps = [
-    "//android_webview/browser:browser_enums",
-    "//components/safe_browsing/db:sb_threat_values",
-  ]
-
-  android_manifest_for_lint = system_webview_android_manifest
-  min_sdk_version = 21
-}
-
-android_library("common_variations_utils_java") {
-  java_files = [ "java/src/org/chromium/android_webview/common/variations/VariationsUtils.java" ]
-  deps = [
-    "//android_webview/proto:aw_variations_seed_proto_java",
-    "//base:base_java",
-    "//components/variations/android:variations_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
-  ]
-}
-
-java_strings_grd("strings_grd") {
-  grd_file = "java/strings/android_webview_strings.grd"
-  outputs = [
-    "values-am/android_webview_strings.xml",
-    "values-ar/android_webview_strings.xml",
-    "values-bg/android_webview_strings.xml",
-    "values-bn/android_webview_strings.xml",
-    "values-ca/android_webview_strings.xml",
-    "values-cs/android_webview_strings.xml",
-    "values-da/android_webview_strings.xml",
-    "values-de/android_webview_strings.xml",
-    "values-el/android_webview_strings.xml",
-    "values-en-rGB/android_webview_strings.xml",
-    "values-es/android_webview_strings.xml",
-    "values-es-rUS/android_webview_strings.xml",
-    "values-et/android_webview_strings.xml",
-    "values-fa/android_webview_strings.xml",
-    "values-fi/android_webview_strings.xml",
-    "values-fr/android_webview_strings.xml",
-    "values-gu/android_webview_strings.xml",
-    "values-hi/android_webview_strings.xml",
-    "values-hr/android_webview_strings.xml",
-    "values-hu/android_webview_strings.xml",
-    "values-in/android_webview_strings.xml",
-    "values-it/android_webview_strings.xml",
-    "values-iw/android_webview_strings.xml",
-    "values-ja/android_webview_strings.xml",
-    "values-kn/android_webview_strings.xml",
-    "values-ko/android_webview_strings.xml",
-    "values-lt/android_webview_strings.xml",
-    "values-lv/android_webview_strings.xml",
-    "values-ml/android_webview_strings.xml",
-    "values-mr/android_webview_strings.xml",
-    "values-ms/android_webview_strings.xml",
-    "values-nb/android_webview_strings.xml",
-    "values-nl/android_webview_strings.xml",
-    "values-pl/android_webview_strings.xml",
-    "values-pt-rBR/android_webview_strings.xml",
-    "values-pt-rPT/android_webview_strings.xml",
-    "values-ro/android_webview_strings.xml",
-    "values-ru/android_webview_strings.xml",
-    "values-sk/android_webview_strings.xml",
-    "values-sl/android_webview_strings.xml",
-    "values-sr/android_webview_strings.xml",
-    "values-sv/android_webview_strings.xml",
-    "values-sw/android_webview_strings.xml",
-    "values-ta/android_webview_strings.xml",
-    "values-te/android_webview_strings.xml",
-    "values-th/android_webview_strings.xml",
-    "values-tl/android_webview_strings.xml",
-    "values-tr/android_webview_strings.xml",
-    "values-uk/android_webview_strings.xml",
-    "values-vi/android_webview_strings.xml",
-    "values-zh-rCN/android_webview_strings.xml",
-    "values-zh-rTW/android_webview_strings.xml",
-    "values/android_webview_strings.xml",
-  ]
-}
-
-# Separate target to allow for a dependency on GmsCore without pulling in all of
-# android_webview_java. It compiles the abstract class; implementations are
-# compiled separately.
-android_library("common_platform_services_java") {
-  java_files = [
-    "java/src/org/chromium/android_webview/common/PlatformServiceBridge.java",
-    "java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java",
-  ]
-
-  deps = [
-    "//base:base_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-  ]
-
-  # The appropriate .class file will be loaded via a dependency to a library
-  # like :platform_service_bridge_upstream_implementation_java below. We only include the
-  # .java file because other files in the target depend on it.
-  jar_excluded_patterns = [ "*/PlatformServiceBridgeImpl.class" ]
-}
-
-# This target compiles the implementation of PlatformServiceBridge for AOSP targets.
-android_library("platform_service_bridge_upstream_implementation_java") {
-  java_files = [ "java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java" ]
-  deps = [
-    ":common_platform_services_java",
-  ]
-}
-
-android_library("common_crash_java") {
-  java_files = [
-    "java/src/org/chromium/android_webview/common/crash/AwCrashReporterClient.java",
-    "java/src/org/chromium/android_webview/common/crash/CrashInfo.java",
-    "java/src/org/chromium/android_webview/common/crash/SystemWideCrashDirectories.java",
-  ]
-
-  deps = [
-    "//base:base_java",
-    "//base:jni_java",
-  ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-}
-
-android_library("common_java") {
-  java_files = [
-    "java/src/org/chromium/android_webview/common/AwResource.java",
-    "java/src/org/chromium/android_webview/common/Flag.java",
-    "java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java",
-    "java/src/org/chromium/android_webview/common/services/ServiceNames.java",
-  ]
-  deps = [
-    "//base:base_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-  ]
-}
-
-android_library("common_commandline_java") {
-  java_files =
-      [ "java/src/org/chromium/android_webview/common/CommandLineUtil.java" ]
-
-  deps = [
-    "//base:base_java",
-  ]
-}
-
-android_aidl("common_aidl") {
-  import_include = [ "java/src" ]
-  sources = [
-    "java/src/org/chromium/android_webview/common/services/ICrashReceiverService.aidl",
-    "java/src/org/chromium/android_webview/common/services/IDeveloperUiService.aidl",
-    "java/src/org/chromium/android_webview/common/services/IVariationsSeedServer.aidl",
-  ]
-}
-
-android_library("common_aidl_java") {
-  srcjar_deps = [ ":common_aidl" ]
-}
-
-# Generate ProductConfig.java so that android_webview_product_config_java's
-# compile step works.
-generate_product_config_srcjar("webview_product_config") {
-  java_package = webview_product_config_java_package
-}
-
-# ProductConfig.java is excluded from the generated .jar
-# (via. jar_excluded_patterns) and the final version is inserted at the APK
-# level - with the list of pak locales populated by looking at the assets that
-# are listed in the final APK's .build_config.
-android_library("android_webview_product_config_java") {
-  java_files = [ "java/src/org/chromium/android_webview/AwLocaleConfig.java" ]
-  srcjar_deps = [ ":webview_product_config" ]
-  jar_excluded_patterns = [ "*/ProductConfig.class" ]
-}
-
-if (public_android_sdk) {
-  system_webview_apk_tmpl("system_webview_apk") {
-    android_manifest = system_webview_android_manifest
-    android_manifest_dep =
-        "//android_webview/nonembedded:system_webview_manifest"
-    deps = upstream_only_webview_deps
-    apk_name = "SystemWebView"
-    min_sdk_version = 21
-  }
-
-  android_resource_sizes_test("resource_sizes_system_webview_apk") {
-    apk_name = "SystemWebView"
-    data_deps = [
-      ":system_webview_apk",
-    ]
-  }
-
-  system_webview_apk_tmpl("trichrome_webview_apk") {
-    android_manifest = trichrome_webview_android_manifest
-    android_manifest_dep =
-        "//android_webview/nonembedded:trichrome_webview_manifest"
-    min_sdk_version = 29
-
-    deps = upstream_only_webview_deps
-    apk_name = "TrichromeWebView"
-    use_trichrome_library = true
-    uncompress_dex = true
-    if (trichrome_synchronized_proguard) {
-      static_library_provider = "//chrome/android:trichrome_library_apk"
-    }
-  }
-
-  if (android_64bit_target_cpu) {
-    system_webview_apk_tmpl("trichrome_webview_64_32_apk") {
-      android_manifest = trichrome_webview_64_32_android_manifest
-      android_manifest_dep =
-          "//android_webview/nonembedded:trichrome_webview_64_32_manifest"
-      is_64_bit_browser = true
-      min_sdk_version = 29
-
-      deps = upstream_only_webview_deps
-      apk_name = "TrichromeWebView6432"
-      use_trichrome_library = true
-      uncompress_dex = true
-      if (trichrome_synchronized_proguard) {
-        static_library_provider = "//chrome/android:trichrome_library_apk"
-      }
-    }
-  }
 }