Merge "Revert "Enable support for verity writes for VABC targets""

This commit is contained in:
Treehugger Robot 2021-04-24 03:36:26 +00:00 committed by Gerrit Code Review
commit 87cfdce392
1 changed files with 9 additions and 0 deletions

View File

@ -1051,6 +1051,15 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
"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."