StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a compressor types option"

Browse Source
This commit is contained in:
Treehugger Robot
2021-11-04 04:13:13 +00:00
committed by Gerrit Code Review
parent cd128891ed 9b6d4ec01b
commit 1e392720c2
1 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/ota_from_target_files.py
View File

@@ -227,6 +227,9 @@ A/B OTA specific options
--force_minor_version --force_minor_version
Override the update_engine minor version for delta generation. Override the update_engine minor version for delta generation.
--compressor_types
A colon ':' separated list of compressors. Allowed values are bz2 and brotli.
""" """
from __future__ import print_function from __future__ import print_function
@@ -294,6 +297,7 @@ OPTIONS.spl_downgrade = False
OPTIONS.vabc_downgrade = False OPTIONS.vabc_downgrade = False
OPTIONS.enable_vabc_xor = True OPTIONS.enable_vabc_xor = True
OPTIONS.force_minor_version = None OPTIONS.force_minor_version = None
OPTIONS.compressor_types = None
POSTINSTALL_CONFIG = 'META/postinstall_config.txt' POSTINSTALL_CONFIG = 'META/postinstall_config.txt'
DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt' DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt'
@@ -1149,6 +1153,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
additional_args += ["--enable_vabc_xor", "true"] additional_args += ["--enable_vabc_xor", "true"]
if OPTIONS.force_minor_version: if OPTIONS.force_minor_version:
additional_args += ["--force_minor_version", OPTIONS.force_minor_version] additional_args += ["--force_minor_version", OPTIONS.force_minor_version]
if OPTIONS.compressor_types:
additional_args += ["--compressor_types", OPTIONS.compressor_types]
additional_args += ["--max_timestamp", max_timestamp] additional_args += ["--max_timestamp", max_timestamp]
if SupportsMainlineGkiUpdates(source_file): if SupportsMainlineGkiUpdates(source_file):
@@ -1324,6 +1330,8 @@ def main(argv):
OPTIONS.enable_vabc_xor = a.lower() != "false" OPTIONS.enable_vabc_xor = a.lower() != "false"
elif o == "--force_minor_version": elif o == "--force_minor_version":
OPTIONS.force_minor_version = a OPTIONS.force_minor_version = a
elif o == "--compressor_types":
OPTIONS.compressor_types = a
else: else:
return False return False
return True return True
@@ -1370,6 +1378,7 @@ def main(argv):
"vabc_downgrade", "vabc_downgrade",
"enable_vabc_xor=", "enable_vabc_xor=",
"force_minor_version=", "force_minor_version=",
"compressor_types=",
], extra_option_handler=option_handler) ], extra_option_handler=option_handler)
if len(args) != 2: if len(args) != 2: