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

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

Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7 am:... 

Merge "Reland: Enable verity computation on VABC devices" am: de1e64c7 am: 8b02856f am: dc2fd4ea

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

Change-Id: Ic6b4dd33e4930e33e84d1e6836580f11d131b5fa
parents 6eac4c22 dc2fd4ea

tools/releasetools/ota_from_target_files.py

+0 −5
Original line number Diff line number Diff line
@@ -1064,11 +1064,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
    # build doesn't supports it.

    if not source_info.is_vabc or not target_info.is_vabc:

      OPTIONS.disable_vabc = True

    if not OPTIONS.disable_vabc:

      # 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, \