Merge "Fix OTA package re-sign on release key servers" into main

        filename.endswith("/prop.default")

def GetOtaSigningArgs():

  args = []

  if OPTIONS.package_key:

    args.extend(["--package_key", OPTIONS.package_key])

  if OPTIONS.payload_signer:

    args.extend(["--payload_signer=" + OPTIONS.payload_signer])

  if OPTIONS.payload_signer_args:

    args.extend(["--payload_signer_args=" + OPTIONS.payload_signer_args])

  if OPTIONS.search_path:

    args.extend(["--search_path", OPTIONS.search_path])

  if OPTIONS.payload_signer_maximum_signature_size:

    args.extend(["--payload_signer_maximum_signature_size",

                OPTIONS.payload_signer_maximum_signature_size])

  if OPTIONS.private_key_suffix:

    args.extend(["--private_key_suffix", OPTIONS.private_key_suffix])

  return args

def RegenerateKernelPartitions(input_tf_zip: zipfile.ZipFile, output_tf_zip: zipfile.ZipFile, misc_info):

  """Re-generate boot and dtbo partitions using new signing configuration"""

  files_to_unzip = [

      if os.path.exists(signed_16k_dtbo_image):

        signed_dtbo_image += ":" + signed_16k_dtbo_image

  args = ["ota_from_raw_img", "--package_key", OPTIONS.package_key,

  args = ["ota_from_raw_img",

          "--max_timestamp", timestamp, "--output", input_ota.name]

  args.extend(GetOtaSigningArgs())

  if "dtbo" in partitions:

    args.extend(["--partition_name", "boot,dtbo",

                signed_boot_image, signed_dtbo_image])