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

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

Merge "Disable verity for VABC updates on android R"

parents de1949b5 a9a87ec2

tools/releasetools/common.py

+5 −0
Original line number Diff line number Diff line
@@ -454,6 +454,11 @@ class BuildInfo(object): 
        vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true"

    return vabc_enabled



  @property

  def is_android_r(self):

    system_prop = self.info_dict.get("system.build.prop")

    return system_prop and system_prop.GetProp("ro.build.version.release") == "11"



  @property

  def is_vabc_xor(self):

    vendor_prop = self.info_dict.get("vendor.build.prop")

tools/releasetools/ota_from_target_files.py

+8 −0
Original line number Diff line number Diff line
@@ -1145,6 +1145,14 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
      logger.info("Either source or target does not support VABC, disabling.")

      OPTIONS.disable_vabc = True



    # Virtual AB Compression was introduced in Androd S.

    # Later, we backported VABC to Android R. But verity support was not

    # backported, so if VABC is used and we are on Android R, disable

    # verity computation.

    if not OPTIONS.disable_vabc and source_info.is_android_r:

      OPTIONS.disable_verity_computation = True

      OPTIONS.disable_fec_computation = True



  else:

    assert "ab_partitions" in OPTIONS.info_dict, \

        "META/ab_partitions.txt is required for ab_update."