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

Commit b7b838fd authored by Daniel Zheng's avatar Daniel Zheng Committed by Gerrit Code Review
Browse files

Merge "Update check to work with compression levels" into main

parents 5afa685f 15a36a14

tools/releasetools/ota_from_target_files.py

+3 −3
Original line number Diff line number Diff line
@@ -856,10 +856,10 @@ def ExtractOrCopyTargetFiles(target_file): 
    return ExtractTargetFiles(target_file)





def ValidateCompressinParam(target_info):

def ValidateCompressionParam(target_info):

  vabc_compression_param = OPTIONS.vabc_compression_param

  if vabc_compression_param:

    minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[vabc_compression_param]

    minimum_api_level_required = VABC_COMPRESSION_PARAM_SUPPORT[vabc_compression_param.split(",")[0]]

    if target_info.vendor_api_level < minimum_api_level_required:

      raise ValueError("Specified VABC compression param {} is only supported for API level >= {}, device is on API level {}".format(

          vabc_compression_param, minimum_api_level_required, target_info.vendor_api_level))
@@ -872,7 +872,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
  target_info = common.BuildInfo(OPTIONS.info_dict, OPTIONS.oem_dicts)

  if OPTIONS.disable_vabc and target_info.is_release_key:

    raise ValueError("Disabling VABC on release-key builds is not supported.")

  ValidateCompressinParam(target_info)

  ValidateCompressionParam(target_info)

  vabc_compression_param = target_info.vabc_compression_param



  target_file = ExtractOrCopyTargetFiles(target_file)