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

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

Merge "Use misc_info.txt to check for VABC"

parents 8844e4f1 e634bde6

tools/releasetools/common.py

+6 −8
Original line number Diff line number Diff line
@@ -450,10 +450,7 @@ class BuildInfo(object): 


  @property

  def is_vabc(self):

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

    vabc_enabled = vendor_prop and \

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

    return vabc_enabled

    return self.info_dict.get("virtual_ab_compression") == "true"



  @property

  def is_android_r(self):
@@ -1396,7 +1393,8 @@ def RunHostInitVerifier(product_out, partition_map): 
def AppendAVBSigningArgs(cmd, partition):

  """Append signing arguments for avbtool."""

  # e.g., "--key path/to/signing_key --algorithm SHA256_RSA4096"

  key_path = ResolveAVBSigningPathArgs(OPTIONS.info_dict.get("avb_" + partition + "_key_path"))

  key_path = ResolveAVBSigningPathArgs(

      OPTIONS.info_dict.get("avb_" + partition + "_key_path"))

  algorithm = OPTIONS.info_dict.get("avb_" + partition + "_algorithm")

  if key_path and algorithm:

    cmd.extend(["--key", key_path, "--algorithm", algorithm])