Fix version code not being set in proguard filename for WebView bundles

Need to pass version_code to the android_app_bundle() target.

Bug: 1119488
Change-Id: I6a5c0501b54b2acc45bf7ac40c427aabf7f0891a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363669Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800131}

android_webview/system_webview_bundle.gni

@@ -7,19 +7,21 @@ import("//build/config/locales.gni")
 import("//weblayer/variables.gni")
 
 template("system_webview_bundle") {
+  _base_target_name = get_label_info(invoker.base_module_target, "name")
+  _base_target_gen_dir =
+      get_label_info(invoker.base_module_target, "target_gen_dir")
+  _base_module_build_config =
+      "$_base_target_gen_dir/${_base_target_name}.build_config"
+  _rebased_base_module_build_config =
+      rebase_path(_base_module_build_config, root_build_dir)
+  _base_module_version_code =
+      "@FileArg($_rebased_base_module_build_config:deps_info:version_code)"
   if (webview_includes_weblayer && weblayer_in_split) {
     # TODO(crbug.com/1105096): If WebView starts using
     # //components/module_installer, it will probably make sense to refactor
     # chrome_feature_module() to be used here.
-    _base_target_name = get_label_info(invoker.base_module_target, "name")
-    _base_target_gen_dir =
-        get_label_info(invoker.base_module_target, "target_gen_dir")
     _base_module_build_config_target =
         "${invoker.base_module_target}$build_config_target_suffix"
-    _base_module_build_config =
-        "$_base_target_gen_dir/${_base_target_name}.build_config"
-    _rebased_base_module_build_config =
-        rebase_path(_base_module_build_config, root_build_dir)
     _weblayer_module_target = "${target_name}__weblayer_bundle_module"
     _weblayer_module_desc = {
       name = "weblayer"
@@ -46,8 +48,7 @@ template("system_webview_bundle") {
       package_id = 126
       version_name =
           "@FileArg($_rebased_base_module_build_config:deps_info:version_name)"
-      version_code =
-          "@FileArg($_rebased_base_module_build_config:deps_info:version_code)"
+      version_code = _base_module_version_code
       manifest_package =
           "@FileArg($_rebased_base_module_build_config:deps_info:package_name)"
     }
@@ -57,6 +58,7 @@ template("system_webview_bundle") {
     command_line_flags_file = "webview-command-line"
     proguard_enabled = !is_java_debug
     enable_language_splits = true
+    version_code = _base_module_version_code
     if (webview_includes_weblayer && weblayer_in_split) {
       extra_modules = [ _weblayer_module_desc ]
     }