@@ -10,40 +10,40 @@ Subject: [PATCH] Support for extended version name and increments
10
10
3 files changed, 38 insertions(+), 5 deletions(-)
11
11
12
12
diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
13
- index 957bfa0306e6a..adc9798d31f74 100755
13
+ index df72ff54c0eb2..106140bc5caaa 100755
14
14
--- a/build/util/android_chrome_version.py
15
15
+++ b/build/util/android_chrome_version.py
16
16
@@ -317,7 +317,7 @@ def TranslateVersionCode(version_code, is_webview=False):
17
17
is_next_build)
18
18
19
19
20
- - def GenerateVersionCodes(build_number, patch_number, arch, is_next_build ):
21
- + def GenerateVersionCodes(build_number, patch_number, increment_number, arch, is_next_build ):
20
+ - def GenerateVersionCodes(build_number, patch_number, arch):
21
+ + def GenerateVersionCodes(build_number, patch_number, increment_number, arch):
22
22
"""Build dict of version codes for the specified build architecture. Eg:
23
23
24
24
{
25
- @@ -340,7 +340,7 @@ def GenerateVersionCodes(build_number, patch_number, arch, is_next_build ):
25
+ @@ -340,7 +340,7 @@ def GenerateVersionCodes(build_number, patch_number, arch):
26
26
27
27
Thus, this method is responsible for the final two digits of versionCode.
28
28
"""
29
29
- base_version_code = (build_number * 1000 + patch_number) * 100
30
30
+ base_version_code = (build_number * 1000 + patch_number + increment_number) * 100
31
31
32
- if is_next_build:
33
- base_version_code += _NEXT_BUILD_VERSION_CODE_DIFF
34
- @@ -385 ,8 +385 ,8 @@ def main():
32
+ mfg, bitness = _ARCH_TO_MFG_AND_BITNESS[arch]
33
+
34
+ @@ -378 ,8 +378 ,8 @@ def main():
35
35
elif args.version_name:
36
36
if not args.arch:
37
37
parser.error('Required --arch')
38
38
- _, _, build, patch = args.version_name.split('.')
39
- - values = GenerateVersionCodes(int(build), int(patch), args.arch, args.next )
39
+ - values = GenerateVersionCodes(int(build), int(patch), args.arch)
40
40
+ _, _, build, patch, increment = args.version_name.split('.')
41
- + values = GenerateVersionCodes(int(build), int(patch), int(increment), args.arch, args.next )
41
+ + values = GenerateVersionCodes(int(build), int(patch), int(increment), args.arch)
42
42
for k, v in values.items():
43
43
print(f'{k}={v}')
44
44
else:
45
45
diff --git a/build/util/version.py b/build/util/version.py
46
- index 35518ba862f21..1b5aec667ef54 100755
46
+ index c69969b91736c..922a4a2e6ca6c 100755
47
47
--- a/build/util/version.py
48
48
+++ b/build/util/version.py
49
49
@@ -136,6 +136,10 @@ def BuildParser():
@@ -57,21 +57,21 @@ index 35518ba862f21..1b5aec667ef54 100755
57
57
parser.add_argument('-x',
58
58
'--executable',
59
59
default=False,
60
- @@ -213 ,9 +217 ,11 @@ def GenerateValues(options, evals):
60
+ @@ -209 ,9 +213 ,11 @@ def GenerateValues(options, evals):
61
61
for key, val in evals.items():
62
62
values[key] = str(eval(val, globals(), values))
63
63
64
64
+ values['INCREMENT'] = options.increment
65
65
if options.os == 'android':
66
66
android_chrome_version_codes = android_chrome_version.GenerateVersionCodes(
67
- - int(values['BUILD']), int(values['PATCH']), options.arch, options.next )
67
+ - int(values['BUILD']), int(values['PATCH']), options.arch)
68
68
+ int(values['BUILD']), int(values['PATCH']), int(values['INCREMENT']),
69
- + options.arch, options.next )
69
+ + options.arch)
70
70
values.update(android_chrome_version_codes)
71
71
72
72
return values
73
73
diff --git a/chrome/version.gni b/chrome/version.gni
74
- index df1d7654ed182..892a912557472 100644
74
+ index 84ad35c21a292..3292823aee62b 100644
75
75
--- a/chrome/version.gni
76
76
+++ b/chrome/version.gni
77
77
@@ -41,6 +41,33 @@ if (target_os == "android") {
0 commit comments