build: Create trichrome_library_64_32_apk and trichrome_webview_64_32_apk targets.

These will be required in order to use Trichrome in the 64/32
configuration.

Bug: 1010749
Change-Id: I9ba165b13a5ad8034496b5795a53de35847e3786
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1834847
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Auto-Submit: Peter Collingbourne <pcc@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#709348}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b93b4b5c50f03bb658b1f1109fbaad8ac259e097

config/android/rules.gni

@@ -2648,6 +2648,13 @@ if (enable_java_templates) {
         use_final_fields = true
       }
       _srcjar_deps += [ ":${_template_name}__native_libraries" ]
+    } else {
+      if (defined(invoker.native_lib_version_arg)) {
+        not_needed(invoker, [ "native_lib_version_arg" ])
+      }
+      if (defined(invoker.native_lib_version_rule)) {
+        not_needed(invoker, [ "native_lib_version_rule" ])
+      }
     }
 
     _extra_native_libs = []

util/android_chrome_version.py

@@ -156,12 +156,11 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
     version_code_val = new_version_code + diff
     version_codes[version_code_name] = str(version_code_val)
 
-    if arch == 'arm64' or arch == 'x64':
-      for variant, config in ARCH64_APK_VARIANTS.iteritems():
-        if apk in config['PACKAGES']:
-          variant_name = apk + '_' + variant + '_VERSION_CODE'
-          variant_val = version_code_val + config['MODIFIER']
-          version_codes[variant_name] = str(variant_val)
+    for variant, config in ARCH64_APK_VARIANTS.iteritems():
+      if apk in config['PACKAGES']:
+        variant_name = apk + '_' + variant + '_VERSION_CODE'
+        variant_val = version_code_val + config['MODIFIER']
+        version_codes[variant_name] = str(variant_val)
 
 
   return version_codes

util/version.gni

@@ -43,6 +43,7 @@ if (is_mac) {
       "chrome_modern_version_code = \"@CHROME_MODERN_VERSION_CODE@\" " +
       "monochrome_version_code = \"@MONOCHROME_VERSION_CODE@\" " +
       "trichrome_version_code = \"@TRICHROME_VERSION_CODE@\" " +
+      "trichrome_64_32_version_code = \"@TRICHROME_64_32_VERSION_CODE@\" " +
       "notouch_chrome_version_code = \"@NOTOUCH_CHROME_VERSION_CODE@\" " +
       "webview_stable_version_code = \"@WEBVIEW_STABLE_VERSION_CODE@\" " +
       "webview_beta_version_code = \"@WEBVIEW_BETA_VERSION_CODE@\" " +
@@ -52,7 +53,6 @@ if (is_mac) {
     _version_dictionary_template +=
         "monochrome_64_32_version_code = \"@MONOCHROME_64_32_VERSION_CODE@\" " +
         "monochrome_64_version_code = \"@MONOCHROME_64_VERSION_CODE@\" " +
-        "trichrome_64_32_version_code = \"@TRICHROME_64_32_VERSION_CODE@\" " +
         "trichrome_64_version_code = \"@TRICHROME_64_VERSION_CODE@\" "
   }