| commit | 8b02856f97e3f8a6395dc5d1d10aaa84d90a8f5c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri May 14 20:52:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 14 20:52:46 2021 +0000 |
| tree | c8ef04197127bce92b06fdd632cdc27b3d862cf6 | |
| parent | ff4544ceb446ea0ed1cdae6d309b1f8bfeb3aa14 [diff] | |
| parent | de1e64c7fd057f4d9939cc6692d557b9f42ffeae [diff] |
Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd Original change: https://android-review.googlesource.com/c/platform/build/+/1708626 Change-Id: I772e57ff6ed41569d2a6cfd6ac9bfdb9d109e792
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 61c8212..229f7e9 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py
@@ -1064,11 +1064,6 @@ # 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, \