Android: Remove 64-bit targets from 32-bit build config

The targets adjusted here should never have existed on 32-bit build
configurations.

Additionally, be more explicit about the various configurations in
64-bit targets.  Currently, the extra arguments may not be used, but in
follow-on changes, they will be.

Bug: 1027573
Change-Id: I42efc07618a7bfa64a04dd8d1b6c5ccc79076ef2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1934837Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719251}

android_webview/BUILD.gn

@@ -822,19 +822,21 @@ if (public_android_sdk) {
     }
   }
 
-  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"
+  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"
+      }
     }
   }
 }

chrome/android/BUILD.gn

@@ -1806,25 +1806,28 @@ if (public_android_sdk) {
     }
   }
 
-  trichrome_library_apk_tmpl("trichrome_library_64_32_apk") {
-    apk_name = "TrichromeLibrary6432"
-    android_manifest = trichrome_library_64_32_android_manifest
-    android_manifest_dep = ":trichrome_library_64_32_android_manifest"
-    is_64_bit_browser = true
+  if (android_64bit_target_cpu) {
+    trichrome_library_apk_tmpl("trichrome_library_64_32_apk") {
+      apk_name = "TrichromeLibrary6432"
+      android_manifest = trichrome_library_64_32_android_manifest
+      android_manifest_dep = ":trichrome_library_64_32_android_manifest"
+      is_64_bit_browser = true
 
-    if (trichrome_synchronized_proguard) {
-      shared_resources_whitelist_target = "//android_webview:system_webview_apk"
-      shared_resources_whitelist_locales = locales
-      static_library_dependent_targets = [
-        {
-          name = "//android_webview:trichrome_webview_64_32_apk"
-          is_resource_ids_provider = true
-        },
-        {
-          name = ":trichrome_chrome_64_32_bundle"
-          is_resource_ids_provider = false
-        },
-      ]
+      if (trichrome_synchronized_proguard) {
+        shared_resources_whitelist_target =
+            "//android_webview:system_webview_apk"
+        shared_resources_whitelist_locales = locales
+        static_library_dependent_targets = [
+          {
+            name = "//android_webview:trichrome_webview_64_32_apk"
+            is_resource_ids_provider = true
+          },
+          {
+            name = ":trichrome_chrome_64_32_bundle"
+            is_resource_ids_provider = false
+          },
+        ]
+      }
     }
   }
 }