am 59f4ff10: Add verity_signer and verity_key flags to add_img_to_target_files.

OPTIONS.add_missing = False

OPTIONS.rebuild_recovery = False

OPTIONS.replace_verity_public_key = False

OPTIONS.replace_verity_private_key = False

OPTIONS.verity_signer_path = None

def AddSystem(output_zip, prefix="IMAGES/", recovery_img=None, boot_img=None):

  """Turn the contents of SYSTEM into a system image and store it in

  common.ZipClose(output_zip)

def main(argv):

  def option_handler(o, _):

  def option_handler(o, a):

    if o in ("-a", "--add_missing"):

      OPTIONS.add_missing = True

    elif o in ("-r", "--rebuild_recovery",):

      OPTIONS.rebuild_recovery = True

    elif o == "--replace_verity_private_key":

      OPTIONS.replace_verity_private_key = (True, a)

    elif o == "--replace_verity_public_key":

      OPTIONS.replace_verity_public_key = (True, a)

    elif o == "--verity_signer_path":

      OPTIONS.verity_signer_path = a

    else:

      return False

    return True

  args = common.ParseOptions(

      argv, __doc__, extra_opts="ar",

      extra_long_opts=["add_missing", "rebuild_recovery"],

      extra_long_opts=["add_missing", "rebuild_recovery",

                       "replace_verity_public_key=",

                       "replace_verity_private_key=",

                       "verity_signer_path="],

      extra_option_handler=option_handler)