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

Commit b0cb04f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable support for verity writes for VABC targets"" am:... 

Merge "Revert "Enable support for verity writes for VABC targets"" am: 87cfdce3 am: c06f3199 am: 756437a8

Original change: https://android-review.googlesource.com/c/platform/build/+/1685709

Change-Id: I240c17fb6aff0a84c5ef764034fcb1206e575c5b
parents b1ff2644 756437a8

tools/releasetools/ota_from_target_files.py

+9 −0
Original line number Diff line number Diff line
@@ -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."