[AW] Move webview manifest rules to //aw/apk/BUILD.gn

This moves the template rules that generate WebView's AndroidManifests
to //aw/apk/BUILD.gn since the templates live in //aw/apk/java.

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

android_webview/BUILD.gn

@@ -87,31 +87,11 @@ generate_jar_jni("cancellation_signal_android_jar_jni_headers") {
   classes = [ "android/os/CancellationSignal.class" ]
 }
 
-jinja_template("system_webview_manifest") {
-  input = "apk/java/AndroidManifest.xml"
-  output = system_webview_android_manifest
-  variables = [ "manifest_package=$system_webview_package_name" ]
-}
-
-jinja_template("trichrome_webview_manifest") {
-  input = "apk/java/AndroidManifest.xml"
-  output = trichrome_webview_android_manifest
-  variables = trichrome_jinja_variables + [
-                "trichrome_version=$trichrome_version_code",
-                "manifest_package=$system_webview_package_name",
-                "library=libmonochrome.so",
-              ]
-}
-
-jinja_template("trichrome_webview_64_32_manifest") {
-  input = "apk/java/AndroidManifest.xml"
-  output = trichrome_webview_64_32_android_manifest
-  variables = trichrome_jinja_variables + [
-                "use32bitAbi=",
-                "trichrome_version=$trichrome_64_32_version_code",
-                "manifest_package=$system_webview_package_name",
-                "library=libmonochrome_64.so",
-              ]
+# TODO(crbug.com/934152): Delete this once Clank uses the new manifest location.
+group("system_webview_manifest") {
+  deps = [
+    "//android_webview/apk:system_webview_manifest",
+  ]
 }
 
 webview_repack_locales("repack_locales") {
@@ -593,7 +573,7 @@ android_library("browser_java") {
     ":common_platform_services_java",
     ":common_variations_utils_java",
     ":resources",
-    ":system_webview_manifest",
+    "//android_webview/apk:system_webview_manifest",
     "//base:base_java",
     "//base:jni_java",
     "//components/autofill/android:autofill_java",
@@ -801,7 +781,7 @@ android_library("android_webview_locale_config_java") {
 if (public_android_sdk) {
   system_webview_apk_tmpl("system_webview_apk") {
     android_manifest = system_webview_android_manifest
-    android_manifest_dep = ":system_webview_manifest"
+    android_manifest_dep = "//android_webview/apk:system_webview_manifest"
     deps = upstream_only_webview_deps
     apk_name = "SystemWebView"
     min_sdk_version = 21
@@ -816,7 +796,7 @@ if (public_android_sdk) {
 
   system_webview_apk_tmpl("trichrome_webview_apk") {
     android_manifest = trichrome_webview_android_manifest
-    android_manifest_dep = ":trichrome_webview_manifest"
+    android_manifest_dep = "//android_webview/apk:trichrome_webview_manifest"
 
     # TODO(torne): make minsdk=Q once we no longer build hacky P version
     min_sdk_version = android_sdk_version
@@ -832,7 +812,8 @@ if (public_android_sdk) {
 
   system_webview_apk_tmpl("trichrome_webview_64_32_apk") {
     android_manifest = trichrome_webview_64_32_android_manifest
-    android_manifest_dep = ":trichrome_webview_64_32_manifest"
+    android_manifest_dep =
+        "//android_webview/apk:trichrome_webview_64_32_manifest"
     is_64_bit_browser = true
 
     # TODO(torne): make minsdk=Q once we no longer build hacky P version
@@ -851,7 +832,7 @@ if (public_android_sdk) {
   # builds.
   system_webview_apk_tmpl("trichrome_webview_for_bundle_apk") {
     android_manifest = trichrome_webview_android_manifest
-    android_manifest_dep = ":trichrome_webview_manifest"
+    android_manifest_dep = "//android_webview/apk:trichrome_webview_manifest"
 
     # TODO(torne): make minsdk=Q once we no longer build hacky P version
     min_sdk_version = android_sdk_version

android_webview/apk/BUILD.gn

@@ -47,8 +47,8 @@ android_library("devui_java") {
   ]
   deps = [
     ":devui_resources",
+    ":system_webview_manifest",
     "//android_webview:common_crash_java",
-    "//android_webview:system_webview_manifest",
     "//base:base_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//ui/android:ui_java",
@@ -67,12 +67,12 @@ android_library("services_java") {
     "java/src/org/chromium/android_webview/services/VariationsSeedServer.java",
   ]
   deps = [
+    ":system_webview_manifest",
     "//android_webview:common_aidl_java",
     "//android_webview:common_commandline_java",
     "//android_webview:common_crash_java",
     "//android_webview:common_platform_services_java",
     "//android_webview:common_variations_utils_java",
-    "//android_webview:system_webview_manifest",
     "//base:base_java",
     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
     "//components/minidump_uploader:minidump_uploader_java",
@@ -107,3 +107,30 @@ android_resources("devui_resources") {
   resource_dirs = [ "java/res_devui" ]
   custom_package = "org.chromium.android_webview.devui"
 }
+
+jinja_template("system_webview_manifest") {
+  input = "java/AndroidManifest.xml"
+  output = system_webview_android_manifest
+  variables = [ "manifest_package=$system_webview_package_name" ]
+}
+
+jinja_template("trichrome_webview_manifest") {
+  input = "java/AndroidManifest.xml"
+  output = trichrome_webview_android_manifest
+  variables = trichrome_jinja_variables + [
+                "trichrome_version=$trichrome_version_code",
+                "manifest_package=$system_webview_package_name",
+                "library=libmonochrome.so",
+              ]
+}
+
+jinja_template("trichrome_webview_64_32_manifest") {
+  input = "java/AndroidManifest.xml"
+  output = trichrome_webview_64_32_android_manifest
+  variables = trichrome_jinja_variables + [
+                "use32bitAbi=",
+                "trichrome_version=$trichrome_64_32_version_code",
+                "manifest_package=$system_webview_package_name",
+                "library=libmonochrome_64.so",
+              ]
+}

android_webview/glue/BUILD.gn

@@ -13,7 +13,7 @@ android_library("glue") {
     "//android_webview:android_webview_locale_config_java",
     "//android_webview:common_commandline_java",
     "//android_webview:common_java",
-    "//android_webview:system_webview_manifest",
+    "//android_webview/apk:system_webview_manifest",
     "//android_webview/support_library/boundary_interfaces:boundary_interface_java",
     "//android_webview/support_library/callback:callback_java",
     "//base:base_java",