Reland: Enable verity computation on VABC devices

Test: th
Test: Manual OTA test on bramble, pause/resume multiple times
Test: verity enabled, VABC enabled OTA
Test: verity enabled, VABC disabled OTA
Test: verity disabled, VABC enabled OTA
Test: verity disabled, VABC disabled OTA

Change-Id: Ia236984b158761f84f54ab7a6d3d49491c249546
This commit is contained in:
Kelvin Zhang 2021-05-13 14:53:58 -04:00
parent 3218d79aa7
commit 4de9bb23f2
1 changed files with 0 additions and 5 deletions

View File

@ -1064,11 +1064,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
# build doesn't supports it. # build doesn't supports it.
if not source_info.is_vabc or not target_info.is_vabc: if not source_info.is_vabc or not target_info.is_vabc:
OPTIONS.disable_vabc = True OPTIONS.disable_vabc = True
if not OPTIONS.disable_vabc:
# TODO(zhangkelvin) Remove this once FEC on VABC is supported
logger.info("Virtual AB Compression enabled, disabling FEC")
OPTIONS.disable_fec_computation = True
OPTIONS.disable_verity_computation = True
else: else:
assert "ab_partitions" in OPTIONS.info_dict, \ assert "ab_partitions" in OPTIONS.info_dict, \