Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d437e41 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Enable support for verity writes for VABC targets"

parents f6897c8f 6bb647fb
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -1051,15 +1051,6 @@ 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."