Add automotive version codes for all architectures.
Change-Id: Id026af96507d0246fa6e4257e72901f3d1e1cdb1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4846569 Reviewed-by: Andrew Grieve <agrieve@chromium.org> Commit-Queue: Ben Mason <benmason@chromium.org> Cr-Commit-Position: refs/heads/main@{#1193085}
This commit is contained in:
Ben Mason
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
ffec6f5eaa
commit
ad24b0ec9a
@ -85,6 +85,7 @@ _APKS = {
|
||||
('CHROME_MODERN', 'CHROME_MODERN', '32'),
|
||||
('MONOCHROME', 'MONOCHROME', '32'),
|
||||
('TRICHROME', 'TRICHROME', '32'),
|
||||
('TRICHROME_AUTO', 'TRICHROME_AUTO', '32'),
|
||||
('TRICHROME_BETA', 'TRICHROME_BETA', '32'),
|
||||
('WEBVIEW_STABLE', 'WEBVIEW_STABLE', '32'),
|
||||
('WEBVIEW_BETA', 'WEBVIEW_BETA', '32'),
|
||||
@ -95,6 +96,7 @@ _APKS = {
|
||||
('CHROME_MODERN', 'CHROME_MODERN', '64'),
|
||||
('MONOCHROME', 'MONOCHROME', '64'),
|
||||
('TRICHROME', 'TRICHROME', '64'),
|
||||
('TRICHROME_AUTO', 'TRICHROME_AUTO', '64'),
|
||||
('TRICHROME_BETA', 'TRICHROME_BETA', '64'),
|
||||
('WEBVIEW_STABLE', 'WEBVIEW_STABLE', '64'),
|
||||
('WEBVIEW_BETA', 'WEBVIEW_BETA', '64'),
|
||||
@ -114,6 +116,10 @@ _APKS = {
|
||||
('TRICHROME_64_32', 'TRICHROME', '64_32'),
|
||||
('TRICHROME_64_32_HIGH', 'TRICHROME', '64_32_high'),
|
||||
('TRICHROME_64', 'TRICHROME', '64'),
|
||||
('TRICHROME_AUTO', 'TRICHROME_AUTO', '32_64'),
|
||||
('TRICHROME_AUTO_32', 'TRICHROME_AUTO', '32'),
|
||||
('TRICHROME_AUTO_32_64', 'TRICHROME_AUTO', '32_64'),
|
||||
('TRICHROME_AUTO_64', 'TRICHROME_AUTO', '64'),
|
||||
('TRICHROME_AUTO_64_32', 'TRICHROME_AUTO', '64_32'),
|
||||
('TRICHROME_AUTO_64_32_HIGH', 'TRICHROME_AUTO', '64_32_high'),
|
||||
('TRICHROME_BETA', 'TRICHROME_BETA', '32_64'),
|
||||
|
||||
@ -63,8 +63,10 @@ class _VersionTest(unittest.TestCase):
|
||||
is_next_build=False)
|
||||
|
||||
trichrome_version_code = output['TRICHROME_VERSION_CODE']
|
||||
trichrome_auto_version_code = output['TRICHROME_AUTO_VERSION_CODE']
|
||||
|
||||
self.assertEqual(trichrome_version_code, '484400030')
|
||||
self.assertEqual(trichrome_auto_version_code, '484400050')
|
||||
|
||||
def testGenerateVersionCodesAndroidWebviewStable(self):
|
||||
"""Assert it gives correct values for standard/example inputs"""
|
||||
@ -179,6 +181,11 @@ class _VersionTest(unittest.TestCase):
|
||||
arch_trichrome_64_32_high_version_code = output[
|
||||
'TRICHROME_64_32_HIGH_VERSION_CODE']
|
||||
arch_trichrome_64_version_code = output['TRICHROME_64_VERSION_CODE']
|
||||
arch_trichrome_auto_version_code = output['TRICHROME_AUTO_VERSION_CODE']
|
||||
arch_trichrome_auto_32_version_code = output['TRICHROME_AUTO_32_VERSION_CODE']
|
||||
arch_trichrome_auto_32_64_version_code = output['TRICHROME_AUTO_32_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_version_code = output[
|
||||
'TRICHROME_AUTO_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_32_version_code = output[
|
||||
'TRICHROME_AUTO_64_32_VERSION_CODE']
|
||||
|
||||
@ -193,6 +200,10 @@ class _VersionTest(unittest.TestCase):
|
||||
self.assertEqual(arch_trichrome_64_32_version_code, '484400034')
|
||||
self.assertEqual(arch_trichrome_64_32_high_version_code, '484400039')
|
||||
self.assertEqual(arch_trichrome_64_version_code, '484400035')
|
||||
self.assertEqual(arch_trichrome_auto_version_code, '484400053')
|
||||
self.assertEqual(arch_trichrome_auto_32_version_code, '484400050')
|
||||
self.assertEqual(arch_trichrome_auto_32_64_version_code, '484400053')
|
||||
self.assertEqual(arch_trichrome_auto_64_version_code, '484400055')
|
||||
self.assertEqual(arch_trichrome_auto_64_32_version_code, '484400054')
|
||||
|
||||
def testGenerateVersionCodesAndroidArchX64(self):
|
||||
@ -229,6 +240,11 @@ class _VersionTest(unittest.TestCase):
|
||||
arch_trichrome_version_code = output['TRICHROME_VERSION_CODE']
|
||||
arch_trichrome_64_32_version_code = output['TRICHROME_64_32_VERSION_CODE']
|
||||
arch_trichrome_64_version_code = output['TRICHROME_64_VERSION_CODE']
|
||||
arch_trichrome_auto_version_code = output['TRICHROME_AUTO_VERSION_CODE']
|
||||
arch_trichrome_auto_32_version_code = output['TRICHROME_AUTO_32_VERSION_CODE']
|
||||
arch_trichrome_auto_32_64_version_code = output['TRICHROME_AUTO_32_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_version_code = output[
|
||||
'TRICHROME_AUTO_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_32_version_code = output[
|
||||
'TRICHROME_AUTO_64_32_VERSION_CODE']
|
||||
|
||||
@ -242,6 +258,10 @@ class _VersionTest(unittest.TestCase):
|
||||
self.assertEqual(arch_trichrome_version_code, '484400036')
|
||||
self.assertEqual(arch_trichrome_64_32_version_code, '484400037')
|
||||
self.assertEqual(arch_trichrome_64_version_code, '484400038')
|
||||
self.assertEqual(arch_trichrome_auto_version_code, '484400056')
|
||||
self.assertEqual(arch_trichrome_auto_32_version_code, '484400051')
|
||||
self.assertEqual(arch_trichrome_auto_32_64_version_code, '484400056')
|
||||
self.assertEqual(arch_trichrome_auto_64_version_code, '484400058')
|
||||
self.assertEqual(arch_trichrome_auto_64_32_version_code, '484400057')
|
||||
|
||||
def testGenerateVersionCodesAndroidArchOrderArm(self):
|
||||
@ -502,6 +522,11 @@ class _VersionGroupedTest(unittest.TestCase):
|
||||
arch_trichrome_64_32_version_code = output['TRICHROME_64_32_VERSION_CODE']
|
||||
arch_trichrome_64_32_high_version_code = output[
|
||||
'TRICHROME_64_32_HIGH_VERSION_CODE']
|
||||
arch_trichrome_auto_version_code = output['TRICHROME_AUTO_VERSION_CODE']
|
||||
arch_trichrome_auto_32_version_code = output['TRICHROME_AUTO_32_VERSION_CODE']
|
||||
arch_trichrome_auto_32_64_version_code = output['TRICHROME_AUTO_32_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_version_code = output[
|
||||
'TRICHROME_AUTO_64_VERSION_CODE']
|
||||
arch_trichrome_64_version_code = output['TRICHROME_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_32_version_code = output[
|
||||
'TRICHROME_AUTO_64_32_VERSION_CODE']
|
||||
@ -521,6 +546,10 @@ class _VersionGroupedTest(unittest.TestCase):
|
||||
self.assertEqual(arch_trichrome_64_version_code, '575000034')
|
||||
self.assertEqual(arch_trichrome_auto_64_32_version_code, '575000052')
|
||||
self.assertEqual(arch_trichrome_auto_64_32_high_version_code, '575000053')
|
||||
self.assertEqual(arch_trichrome_auto_64_version_code, '575000054')
|
||||
self.assertEqual(arch_trichrome_auto_version_code, '575000051')
|
||||
self.assertEqual(arch_trichrome_auto_32_version_code, '575000050')
|
||||
self.assertEqual(arch_trichrome_auto_32_64_version_code, '575000051')
|
||||
|
||||
def testGenerateVersionCodesAndroidArchX64(self):
|
||||
"""Assert it handles different architectures correctly.
|
||||
@ -558,6 +587,14 @@ class _VersionGroupedTest(unittest.TestCase):
|
||||
arch_trichrome_64_version_code = output['TRICHROME_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_32_version_code = output[
|
||||
'TRICHROME_AUTO_64_32_VERSION_CODE']
|
||||
arch_trichrome_auto_version_code = output['TRICHROME_AUTO_VERSION_CODE']
|
||||
arch_trichrome_auto_32_version_code = output['TRICHROME_AUTO_32_VERSION_CODE']
|
||||
arch_trichrome_auto_32_64_version_code = output['TRICHROME_AUTO_32_64_VERSION_CODE']
|
||||
arch_trichrome_64_version_code = output['TRICHROME_64_VERSION_CODE']
|
||||
arch_trichrome_auto_64_32_version_code = output[
|
||||
'TRICHROME_AUTO_64_32_VERSION_CODE']
|
||||
arch_trichrome_auto_64_version_code = output[
|
||||
'TRICHROME_AUTO_64_VERSION_CODE']
|
||||
|
||||
self.assertEqual(arch_monochrome_32_version_code, '575000026')
|
||||
self.assertEqual(arch_monochrome_32_64_version_code, '575000027')
|
||||
@ -569,6 +606,10 @@ class _VersionGroupedTest(unittest.TestCase):
|
||||
self.assertEqual(arch_trichrome_version_code, '575000037')
|
||||
self.assertEqual(arch_trichrome_64_32_version_code, '575000038')
|
||||
self.assertEqual(arch_trichrome_64_version_code, '575000039')
|
||||
self.assertEqual(arch_trichrome_auto_version_code, '575000057')
|
||||
self.assertEqual(arch_trichrome_auto_32_version_code, '575000056')
|
||||
self.assertEqual(arch_trichrome_auto_32_64_version_code, '575000057')
|
||||
self.assertEqual(arch_trichrome_auto_64_version_code, '575000059')
|
||||
self.assertEqual(arch_trichrome_auto_64_32_version_code, '575000058')
|
||||
|
||||
def testGenerateVersionCodesAndroidArchRiscv64(self):
|
||||
@ -814,6 +855,16 @@ class _VersionCodeTest(unittest.TestCase):
|
||||
self.assertEqual(abi, 'arm_32_64')
|
||||
self.assertEqual(is_next_build, False)
|
||||
|
||||
def testArm_Auto_32_64Translate(self):
|
||||
"""Test for an auto build with Trichrome and arm_32_64."""
|
||||
build, patch, package, abi, is_next_build = TranslateVersionCode(
|
||||
'499900053')
|
||||
self.assertEqual(build, 4999)
|
||||
self.assertEqual(patch, 0)
|
||||
self.assertEqual(package, 'TRICHROME_AUTO')
|
||||
self.assertEqual(abi, 'arm_32_64')
|
||||
self.assertEqual(is_next_build, False)
|
||||
|
||||
def testArm_64_32Translate(self):
|
||||
"""Test for a build with Trichrome and arm_64_32."""
|
||||
build, patch, package, abi, is_next_build = TranslateVersionCode(
|
||||
@ -895,6 +946,16 @@ class _VersionCodeTest(unittest.TestCase):
|
||||
self.assertEqual(abi, 'x86_32_64')
|
||||
self.assertEqual(is_next_build, False)
|
||||
|
||||
def testX86_Auto_32_64Translate(self):
|
||||
"""Test for an auto build with x86_32_64."""
|
||||
build, patch, package, abi, is_next_build = TranslateVersionCode(
|
||||
'499900056')
|
||||
self.assertEqual(build, 4999)
|
||||
self.assertEqual(patch, 0)
|
||||
self.assertEqual(package, 'TRICHROME_AUTO')
|
||||
self.assertEqual(abi, 'x86_32_64')
|
||||
self.assertEqual(is_next_build, False)
|
||||
|
||||
def testX86_64_32Translate(self):
|
||||
"""Test for a build with x86_64_32."""
|
||||
build, patch, package, abi, is_next_build = TranslateVersionCode(
|
||||
@ -915,6 +976,16 @@ class _VersionCodeTest(unittest.TestCase):
|
||||
self.assertEqual(abi, 'x86_64_32')
|
||||
self.assertEqual(is_next_build, False)
|
||||
|
||||
def testX86_Auto_64Translate(self):
|
||||
"""Test for an auto build with x86_64."""
|
||||
build, patch, package, abi, is_next_build = TranslateVersionCode(
|
||||
'499900058')
|
||||
self.assertEqual(build, 4999)
|
||||
self.assertEqual(patch, 0)
|
||||
self.assertEqual(package, 'TRICHROME_AUTO')
|
||||
self.assertEqual(abi, 'x86_64')
|
||||
self.assertEqual(is_next_build, False)
|
||||
|
||||
def testWebviewTranslate(self):
|
||||
"""Test for a build with Webview."""
|
||||
build, patch, package, abi, is_next_build = TranslateVersionCode(
|
||||
|
||||
@ -43,6 +43,7 @@ if (is_mac) {
|
||||
"chrome_version_code = " + "\"@CHROME_VERSION_CODE@\" " +
|
||||
"monochrome_version_code = \"@MONOCHROME_VERSION_CODE@\" " +
|
||||
"trichrome_version_code = \"@TRICHROME_VERSION_CODE@\" " +
|
||||
"trichrome_auto_version_code = \"@TRICHROME_AUTO_VERSION_CODE@\" " +
|
||||
"trichrome_beta_version_code = \"@TRICHROME_BETA_VERSION_CODE@\" " +
|
||||
"webview_stable_version_code = \"@WEBVIEW_STABLE_VERSION_CODE@\" " +
|
||||
"webview_beta_version_code = \"@WEBVIEW_BETA_VERSION_CODE@\" " +
|
||||
@ -61,6 +62,10 @@ if (is_mac) {
|
||||
"monochrome_64_version_code = \"@MONOCHROME_64_VERSION_CODE@\" "
|
||||
_version_dictionary_template +=
|
||||
"trichrome_32_version_code = \"@TRICHROME_32_VERSION_CODE@\" "
|
||||
_version_dictionary_template +=
|
||||
"trichrome_auto_32_version_code = \"@TRICHROME_AUTO_32_VERSION_CODE@\" "
|
||||
_version_dictionary_template +=
|
||||
"trichrome_auto_32_64_version_code = \"@TRICHROME_AUTO_32_64_VERSION_CODE@\" "
|
||||
_version_dictionary_template +=
|
||||
"trichrome_32_64_version_code = \"@TRICHROME_32_64_VERSION_CODE@\" "
|
||||
_version_dictionary_template +=
|
||||
@ -68,6 +73,8 @@ if (is_mac) {
|
||||
_version_dictionary_template += "trichrome_auto_64_32_version_code = \"@TRICHROME_AUTO_64_32_VERSION_CODE@\" "
|
||||
_version_dictionary_template +=
|
||||
"trichrome_64_version_code = \"@TRICHROME_64_VERSION_CODE@\" "
|
||||
_version_dictionary_template +=
|
||||
"trichrome_auto_64_version_code = \"@TRICHROME_AUTO_64_VERSION_CODE@\" "
|
||||
if (target_cpu == "arm64") {
|
||||
_version_dictionary_template += "trichrome_64_32_high_version_code = \"@TRICHROME_64_32_HIGH_VERSION_CODE@\" "
|
||||
_version_dictionary_template += "trichrome_auto_64_32_high_version_code = \"@TRICHROME_AUTO_64_32_HIGH_VERSION_CODE@\" "
|
||||
@ -147,10 +154,14 @@ if (is_mac) {
|
||||
"monochrome_64_32_version_code",
|
||||
"monochrome_64_version_code",
|
||||
"trichrome_version_code",
|
||||
"trichrome_auto_version_code",
|
||||
"trichrome_32_version_code",
|
||||
"trichrome_auto_32_version_code",
|
||||
"trichrome_32_64_version_code",
|
||||
"trichrome_64_32_version_code",
|
||||
"trichrome_64_32_high_version_code",
|
||||
"trichrome_auto_32_64_version_code",
|
||||
"trichrome_auto_64_version_code",
|
||||
"trichrome_auto_64_32_version_code",
|
||||
"trichrome_auto_64_32_high_version_code",
|
||||
"trichrome_64_version_code",
|
||||
@ -180,7 +191,7 @@ if (is_android && current_toolchain == default_toolchain) {
|
||||
"Chrome: $chrome_version_code",
|
||||
"Monochrome: $monochrome_version_code",
|
||||
"TrichromeChrome: $trichrome_version_code",
|
||||
"TrichromeChromeOpenBeta: $trichrome_beta_version_code",
|
||||
"TrichromeChromeAuto: $trichrome_auto_version_code",
|
||||
"AndroidWebviewStable: $webview_stable_version_code",
|
||||
"AndroidWebviewBeta: $webview_beta_version_code",
|
||||
"AndroidWebviewDev: $webview_dev_version_code",
|
||||
@ -196,6 +207,9 @@ if (is_android && current_toolchain == default_toolchain) {
|
||||
"TrichromeChrome3264: $trichrome_32_64_version_code",
|
||||
"TrichromeChrome6432: $trichrome_64_32_version_code",
|
||||
"TrichromeChrome64: $trichrome_64_version_code",
|
||||
"TrichromeChromeAuto32: $trichrome_auto_32_version_code",
|
||||
"TrichromeChromeAuto3264: $trichrome_auto_32_64_version_code",
|
||||
"TrichromeChromeAuto64: $trichrome_auto_64_version_code",
|
||||
"TrichromeChromeAuto6432: $trichrome_auto_64_32_version_code",
|
||||
]
|
||||
if (target_cpu == "arm64") {
|
||||
|
||||
Reference in New Issue
Block a user