Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd am: 8b02856f97

Original change: https://android-review.googlesource.com/c/platform/build/+/1708626

Change-Id: Ic695676cd56ac3d8e68a79445af8f89e19bad83e
This commit is contained in:
Treehugger Robot 2021-05-14 21:17:48 +00:00 committed by Automerger Merge Worker
commit dc2fd4ea31
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.
if not source_info.is_vabc or not target_info.is_vabc:
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:
assert "ab_partitions" in OPTIONS.info_dict, \