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

* commit '5790d54ab8d2eb587af7adf39d7abac66b79ad0b':
  Add verity_signer and verity_key flags to add_img_to_target_files.
This commit is contained in:
Baligh Uddin 2015-09-17 04:54:46 +00:00 committed by Android Git Automerger
commit aa3d37a1d7

View file

@ -40,6 +40,9 @@ OPTIONS = common.OPTIONS
OPTIONS.add_missing = False OPTIONS.add_missing = False
OPTIONS.rebuild_recovery = 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): 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 """Turn the contents of SYSTEM into a system image and store it in
@ -296,18 +299,27 @@ def AddImagesToTargetFiles(filename):
common.ZipClose(output_zip) common.ZipClose(output_zip)
def main(argv): def main(argv):
def option_handler(o, _): def option_handler(o, a):
if o in ("-a", "--add_missing"): if o in ("-a", "--add_missing"):
OPTIONS.add_missing = True OPTIONS.add_missing = True
elif o in ("-r", "--rebuild_recovery",): elif o in ("-r", "--rebuild_recovery",):
OPTIONS.rebuild_recovery = True 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: else:
return False return False
return True return True
args = common.ParseOptions( args = common.ParseOptions(
argv, __doc__, extra_opts="ar", 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) extra_option_handler=option_handler)