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

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

Merge "Don't disable verity if VABC is disabled"

parents 4ac1818c 50dc1b88

tools/releasetools/ota_from_target_files.py

+4 −2
Original line number Diff line number Diff line
@@ -1052,8 +1052,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
    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")

    if vendor_prop and \

            vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true":

    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