| commit | 460ce77c30c35eda7f8d4ab6679f36a4c4cf1f51 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri May 14 21:36:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 14 21:36:03 2021 +0000 |
| tree | 252f195122a037b39a2fa86491b3208cb8823d53 | |
| parent | 6eac4c223626a3a85aca8bc4b54b9b3eb7177ca9 [diff] | |
| parent | dc2fd4ea31dcb5fb84e6f772542bc6257fc33af9 [diff] |
Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7fd am: 8b02856f97 am: dc2fd4ea31 Original change: https://android-review.googlesource.com/c/platform/build/+/1708626 Change-Id: Ic6b4dd33e4930e33e84d1e6836580f11d131b5fa
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, \