Merge "Enable support for verity writes for VABC targets"
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 02b2b4d..94dbd4e 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1051,15 +1051,6 @@
"META/ab_partitions.txt is required for ab_update."
target_info = common.BuildInfo(OPTIONS.target_info_dict, OPTIONS.oem_dicts)
source_info = common.BuildInfo(OPTIONS.source_info_dict, OPTIONS.oem_dicts)
- vendor_prop = source_info.info_dict.get("vendor.build.prop")
- vabc_used = vendor_prop and \
- vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true" and \
- not OPTIONS.disable_vabc
- if vabc_used:
- # 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, \
"META/ab_partitions.txt is required for ab_update."