From 4de9bb23f280d4e2910456ff8a9934bc73e67ee7 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 13 May 2021 14:53:58 -0400 Subject: [PATCH] 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 --- tools/releasetools/ota_from_target_files.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 61c8212f7..229f7e91a 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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, \