Add option to override minor version

Pass the minor version override to delta_generator. So we can test
features in tradefed before releasing it to droidfoods.

Bug: 197361113
Test: TH
Change-Id: Ie8846935dfa13784f0745513be13811908f44ac3
This commit is contained in:
Tianjie
2021-09-08 19:09:38 -07:00
parent 355f345956
commit e7ab38d964

View File

@@ -225,6 +225,8 @@ A/B OTA specific options
--enable_vabc_xor
Enable the VABC xor feature. Will reduce space requirements for OTA
--force_minor_version
Override the update_engine minor version for delta generation.
"""
from __future__ import print_function
@@ -291,6 +293,7 @@ OPTIONS.disable_vabc = False
OPTIONS.spl_downgrade = False
OPTIONS.vabc_downgrade = False
OPTIONS.enable_vabc_xor = True
OPTIONS.force_minor_version = None
POSTINSTALL_CONFIG = 'META/postinstall_config.txt'
DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt'
@@ -1144,6 +1147,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
additional_args += ["--disable_vabc", "true"]
if OPTIONS.enable_vabc_xor:
additional_args += ["--enable_vabc_xor", "true"]
if OPTIONS.force_minor_version:
additional_args += ["--force_minor_version", OPTIONS.force_minor_version]
additional_args += ["--max_timestamp", max_timestamp]
if SupportsMainlineGkiUpdates(source_file):
@@ -1317,6 +1322,8 @@ def main(argv):
OPTIONS.vabc_downgrade = True
elif o == "--enable_vabc_xor":
OPTIONS.enable_vabc_xor = a.lower() != "false"
elif o == "--force_minor_version":
OPTIONS.force_minor_version = a
else:
return False
return True
@@ -1362,6 +1369,7 @@ def main(argv):
"spl_downgrade",
"vabc_downgrade",
"enable_vabc_xor=",
"force_minor_version=",
], extra_option_handler=option_handler)
if len(args) != 2: