Default to 64-bit browser for Trichrome

Adds extra 32_64 targets if the previous behavior is needed

Bug: 1093993
Change-Id: I6ffd3fb69c439d0591c4f02ace999d3be67805b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2242253Reviewed-by: Ben Mason <benmason@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779876}

android_webview/BUILD.gn

@@ -123,8 +123,8 @@ template("trichrome_webview_tmpl") {
     use_trichrome_library = true
 
     if (android_64bit_target_cpu) {
-      is_64_bit_browser = false
-      include_64_bit_webview = true
+      is_64_bit_browser = true
+      include_32_bit_webview = true
     }
     static_library_provider = "//chrome/android:trichrome_library_apk"
   }
@@ -199,6 +199,29 @@ if (android_64bit_target_cpu) {
     uncompress_dex = true
   }
 
+  template("trichrome_webview_32_64_tmpl") {
+    system_webview_apk_or_module_tmpl(target_name) {
+      forward_variables_from(invoker, "*")
+      android_manifest = trichrome_webview_32_64_android_manifest
+      android_manifest_dep =
+          "//android_webview/nonembedded:trichrome_webview_32_64_manifest"
+      use_trichrome_library = true
+      is_64_bit_browser = false
+      include_32_bit_webview = true
+      include_64_bit_webview = true
+
+      min_sdk_version = 29
+
+      deps = upstream_only_webview_deps
+      static_library_provider = "//chrome/android:trichrome_library_32_64_apk"
+    }
+  }
+
+  trichrome_webview_32_64_tmpl("trichrome_webview_32_64_apk") {
+    apk_name = "TrichromeWebView3264"
+    uncompress_dex = true
+  }
+
   if (enable_webview_bundles) {
     trichrome_webview_64_32_tmpl("trichrome_webview_64_32_base_bundle_module") {
       target_type = "android_app_bundle_module"
@@ -212,6 +235,19 @@ if (android_64bit_target_cpu) {
       min_sdk_version = 29
       static_library_provider = "//chrome/android:trichrome_library_64_32_apk"
     }
+
+    trichrome_webview_32_64_tmpl("trichrome_webview_32_64_base_bundle_module") {
+      target_type = "android_app_bundle_module"
+      is_base_module = true
+    }
+
+    system_webview_bundle("trichrome_webview_32_64_bundle") {
+      base_module_target = ":trichrome_webview_32_64_base_bundle_module"
+      bundle_name = "TrichromeWebView3264"
+      uncompress_dex = true
+      min_sdk_version = 29
+      static_library_provider = "//chrome/android:trichrome_library_32_64_apk"
+    }
   }
 
   template("trichrome_webview_32_tmpl") {

android_webview/nonembedded/BUILD.gn

@@ -170,11 +170,20 @@ jinja_template("system_webview_manifest") {
 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",
-              ]
+  variables = trichrome_jinja_variables +
+              [ "manifest_package=$system_webview_package_name" ]
+  if (android_64bit_target_cpu) {
+    variables += [
+      "use32bitAbi=",
+      "library=libmonochrome_64.so",
+      "trichrome_version=$trichrome_64_32_version_code",
+    ]
+  } else {
+    variables += [
+      "library=libmonochrome.so",
+      "trichrome_version=$trichrome_version_code",
+    ]
+  }
 }
 
 if (android_64bit_target_cpu) {
@@ -189,6 +198,16 @@ if (android_64bit_target_cpu) {
                 ]
   }
 
+  jinja_template("trichrome_webview_32_64_manifest") {
+    input = "java/AndroidManifest.xml"
+    output = trichrome_webview_32_64_android_manifest
+    variables = trichrome_jinja_variables + [
+                  "trichrome_version=$trichrome_32_64_version_code",
+                  "manifest_package=$system_webview_package_name",
+                  "library=libmonochrome.so",
+                ]
+  }
+
   jinja_template("trichrome_webview_32_manifest") {
     input = "java/AndroidManifest.xml"
     output = trichrome_webview_32_android_manifest

android_webview/variables.gni

@@ -19,6 +19,7 @@ system_webview_android_manifest =
 trichrome_webview_android_manifest =
     "$root_gen_dir/android_webview/trichrome_webview_apk/AndroidManifest.xml"
 trichrome_webview_64_32_android_manifest = "$root_gen_dir/android_webview/trichrome_webview_64_32_apk/AndroidManifest.xml"
+trichrome_webview_32_64_android_manifest = "$root_gen_dir/android_webview/trichrome_webview_32_64_apk/AndroidManifest.xml"
 trichrome_webview_32_android_manifest =
     "$root_gen_dir/android_webview/trichrome_webview_32_apk/AndroidManifest.xml"
 

chrome/android/BUILD.gn

@@ -67,6 +67,8 @@ chrome_modern_public_android_manifest =
     "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml"
 trichrome_library_android_manifest =
     "$target_gen_dir/trichrome_library_apk/AndroidManifest.xml"
+trichrome_library_32_64_android_manifest =
+    "$target_gen_dir/trichrome_library_32_64_apk/AndroidManifest.xml"
 trichrome_library_64_32_android_manifest =
     "$target_gen_dir/trichrome_library_64_32_apk/AndroidManifest.xml"
 trichrome_library_64_android_manifest =
@@ -123,13 +125,26 @@ jinja_template("chrome_modern_public_android_manifest") {
 jinja_template("trichrome_library_android_manifest") {
   input = "java/AndroidManifest_trichrome_library.xml"
   output = trichrome_library_android_manifest
+  if (android_64bit_target_cpu) {
+    _trichrome_version = trichrome_64_32_version_code
+  } else {
+    _trichrome_version = trichrome_version_code
+  }
   variables = trichrome_jinja_variables + [
-                "trichrome_version=$trichrome_version_code",
+                "trichrome_version=$_trichrome_version",
                 "manifest_package=$trichrome_library_package",
               ]
 }
 
 if (android_64bit_target_cpu) {
+  jinja_template("trichrome_library_32_64_android_manifest") {
+    input = "java/AndroidManifest_trichrome_library.xml"
+    output = trichrome_library_32_64_android_manifest
+    variables = trichrome_jinja_variables + [
+                  "trichrome_version=$trichrome_32_64_version_code",
+                  "manifest_package=$trichrome_library_package",
+                ]
+  }
   jinja_template("trichrome_library_64_32_android_manifest") {
     input = "java/AndroidManifest_trichrome_library.xml"
     output = trichrome_library_64_32_android_manifest
@@ -2041,8 +2056,8 @@ trichrome_library_apk_tmpl("trichrome_library_apk") {
   android_manifest_dep = ":trichrome_library_android_manifest"
 
   if (android_64bit_target_cpu) {
-    is_64_bit_browser = false
-    include_64_bit_webview = true
+    is_64_bit_browser = true
+    include_32_bit_webview = true
   }
 
   if (trichrome_synchronized_proguard) {
@@ -2063,6 +2078,14 @@ if (android_64bit_target_cpu) {
     include_64_bit_webview = false
   }
 
+  trichrome_library_apk_tmpl("trichrome_library_32_64_apk") {
+    apk_name = "TrichromeLibrary3264"
+    android_manifest = trichrome_library_32_64_android_manifest
+    android_manifest_dep = ":trichrome_library_32_64_android_manifest"
+    is_64_bit_browser = false
+    include_64_bit_webview = true
+  }
+
   trichrome_library_apk_tmpl("trichrome_library_64_32_apk") {
     apk_name = "TrichromeLibrary6432"
     android_manifest = trichrome_library_64_32_android_manifest
@@ -2693,8 +2716,8 @@ if (public_android_sdk) {
       }
     }
     if (android_64bit_target_cpu) {
-      is_64_bit_browser = false
-      include_64_bit_webview = true
+      is_64_bit_browser = true
+      include_32_bit_webview = true
     }
 
     verify_manifest = _enable_manifest_verification
@@ -2767,6 +2790,15 @@ if (public_android_sdk) {
       use_trichrome_library = true
       static_library_provider = ":trichrome_library_32_apk"
     }
+
+    monochrome_or_trichrome_public_bundle_tmpl(
+        "trichrome_chrome_32_64_bundle") {
+      bundle_suffix = "3264"
+      is_64_bit_browser = false
+      include_64_bit_webview = true
+      use_trichrome_library = true
+      static_library_provider = ":trichrome_library_32_64_apk"
+    }
   }
 }
 

chrome/android/java/trichrome_chrome_bundle__base.arm64.native_libs_and_assets.expected

-apk_path=lib/armeabi-v7a/libarcore_sdk_c.so, compress=False, alignment=4096
-apk_path=lib/armeabi-v7a/libchromium_android_linker.so, compress=False, alignment=4096
+apk_path=lib/arm64-v8a/libarcore_sdk_c.so, compress=False, alignment=4096
+apk_path=lib/arm64-v8a/libchromium_android_linker.so, compress=False, alignment=4096
 apk_path=assets/chrome_100_percent.pak, compress=False, alignment=4
 apk_path=assets/locales/af.pak, compress=False, alignment=4
 apk_path=assets/locales/am.pak, compress=False, alignment=4

chrome/android/java/trichrome_library_apk.arm64.native_libs_and_assets.expected

-apk_path=lib/armeabi-v7a/libcrashpad_handler_trampoline.so, compress=False, alignment=4096
-apk_path=lib/armeabi-v7a/libmonochrome.so, compress=False, alignment=4096
+apk_path=lib/arm64-v8a/libcrashpad_handler_trampoline.so, compress=False, alignment=4096
+apk_path=lib/arm64-v8a/libmonochrome_64.so, compress=False, alignment=4096
 apk_path=assets/icudtl.dat, compress=False, alignment=4
-apk_path=assets/snapshot_blob_32.bin, compress=False, alignment=4
+apk_path=assets/snapshot_blob_64.bin, compress=False, alignment=4