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

Merge "Add flag to manually disable vabc"

Browse Source
This commit is contained in:
Treehugger Robot
2021-02-09 01:14:50 +00:00
committed by Gerrit Code Review
parent 6c9e319da7 bbfa182995
commit 41f416d326
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/ota_from_target_files.py
View File

@@ -272,6 +272,7 @@ OPTIONS.disable_fec_computation = False
OPTIONS.disable_verity_computation = False OPTIONS.disable_verity_computation = False
OPTIONS.partial = None OPTIONS.partial = None
OPTIONS.custom_images = {} OPTIONS.custom_images = {}
OPTIONS.disable_vabc = False
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'
@@ -1090,6 +1091,8 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
partition_timestamps_flags = GeneratePartitionTimestampFlags( partition_timestamps_flags = GeneratePartitionTimestampFlags(
metadata.postcondition.partition_state) metadata.postcondition.partition_state)
if OPTIONS.disable_vabc:
additional_args += ["--disable_vabc", "true"]
additional_args += ["--max_timestamp", max_timestamp] additional_args += ["--max_timestamp", max_timestamp]
if SupportsMainlineGkiUpdates(source_file): if SupportsMainlineGkiUpdates(source_file):
@@ -1257,6 +1260,8 @@ def main(argv):
elif o == "--custom_image": elif o == "--custom_image":
custom_partition, custom_image = a.split("=") custom_partition, custom_image = a.split("=")
OPTIONS.custom_images[custom_partition] = custom_image OPTIONS.custom_images[custom_partition] = custom_image
elif o == "--disable_vabc":
OPTIONS.disable_vabc = True
else: else:
return False return False
return True return True
@@ -1298,6 +1303,7 @@ def main(argv):
"boot_variable_file=", "boot_variable_file=",
"partial=", "partial=",
"custom_image=", "custom_image=",
"disable_vabc",
], extra_option_handler=option_handler) ], extra_option_handler=option_handler)
if len(args) != 2: if len(args) != 2: