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

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

Change-Id: I772e57ff6ed41569d2a6cfd6ac9bfdb9d109e792
This commit is contained in:
Treehugger Robot 2021-05-14 20:52:46 +00:00 committed by Automerger Merge Worker
commit 8b02856f97

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, \