Support updating versionCode without rebasing to new Chromium version

Author: quh4gko8

patches/0100-Support-for-extended-version-name-and-increments.patch

@@ -0,0 +1,85 @@
+From 2ff3f024994941abb94b813a872f84a3ad8524a0 Mon Sep 17 00:00:00 2001
+From: fgei <fgei@gmail.com>
+Date: Sun, 26 Feb 2023 10:39:38 +0100
+Subject: [PATCH] Support for extended version name and increments
+
+---
+ build/util/android_chrome_version.py |  2 +-
+ build/util/version.py                |  5 +++++
+ chrome/version.gni                   | 27 +++++++++++++++++++++++++++
+ 3 files changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
+index 910e304bac436..52ebcde02f052 100755
+--- a/build/util/android_chrome_version.py
++++ b/build/util/android_chrome_version.py
+@@ -281,7 +281,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
+   """
+ 
+   base_version_code = int(
+-      '%s%03d00' % (version_values['BUILD'], int(version_values['PATCH'])))
++      '%s%03d00' % (version_values['BUILD'], (int(version_values['PATCH']) + int(version_values['INCREMENT']))))
+ 
+   if is_next_build:
+     base_version_code += _NEXT_BUILD_VERSION_CODE_DIFF
+diff --git a/build/util/version.py b/build/util/version.py
+index bf7a59eabf799..40ccb48598804 100755
+--- a/build/util/version.py
++++ b/build/util/version.py
+@@ -128,6 +128,10 @@ def BuildParser():
+                       help='Write substituted strings to FILE.')
+   parser.add_argument('-t', '--template', default=None,
+                       help='Use TEMPLATE as the strings to substitute.')
++  parser.add_argument(
++      '--increment',
++      default='0',
++      help='Version increment to append at version_name, add at version_code.')
+   parser.add_argument(
+       '-e',
+       '--eval',
+@@ -200,6 +204,7 @@ def GenerateValues(options, evals):
+   for key, val in evals.items():
+     values[key] = str(eval(val, globals(), values))
+ 
++  values['INCREMENT'] = options.increment
+   if options.os == 'android':
+     android_chrome_version_codes = android_chrome_version.GenerateVersionCodes(
+         values, options.arch, options.next)
+diff --git a/chrome/version.gni b/chrome/version.gni
+index e197cbe85192b..89d1a4a08e379 100644
+--- a/chrome/version.gni
++++ b/chrome/version.gni
+@@ -39,6 +39,33 @@ if (is_mac) {
+   import("//build/config/android/config.gni")
+   import("//build/config/chrome_build.gni")
+ 
++  declare_args() {
++    # Allows usage for extended versionName increment for android.
++    ext_version_enabled = false
++    # Increment positive integer to append at versionName,
++    # as well as to add on patch section of versionCode.
++    # String is used for utility at build/util/version.py.
++    ext_version_increment = ""
++  }
++
++  # Disallow setting extended version increment when disabled.
++  assert(ext_version_enabled || ext_version_increment == "")
++
++  if (ext_version_enabled) {
++    _version_dictionary_template = "full = \"@MAJOR@.@MINOR@.@BUILD@" +
++                                 ".@PATCH@.@INCREMENT@\" " +
++                                 "major = \"@MAJOR@\" minor = \"@MINOR@\" " +
++                                 "build = \"@BUILD@\" patch = \"@PATCH@\" " +
++                                 "increment = \"@INCREMENT@\" "
++
++    if (ext_version_increment != "") {
++      _script_arguments += [
++        "--increment",
++        ext_version_increment
++      ]
++    }
++  }
++
+   _version_dictionary_template +=
+       "chrome_version_code = " + "\"@CHROME_VERSION_CODE@\" " +
+       "chrome_modern_version_code = \"@CHROME_MODERN_VERSION_CODE@\" " +