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

Commit ec305d4a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Extend merge_ota with extra options for signapk.jar" into main am: 1ccc7015 

Original change: https://android-review.googlesource.com/c/platform/build/+/3426559



Change-Id: I3a1e86bb9507d1333cace8dae2e7cd1e39cffebe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0eab1ee3 1ccc7015

tools/releasetools/merge_ota.py

+12 −0
Original line number Diff line number Diff line
@@ -226,9 +226,21 @@ def main(argv): 
    logger.setLevel(logging.INFO)



  logger.info(args)

  if args.java_path:

    common.OPTIONS.java_path = args.java_path



  if args.search_path:

    common.OPTIONS.search_path = args.search_path



  if args.signapk_path:

    common.OPTIONS.signapk_path = args.signapk_path



  if args.extra_signapk_args:

    common.OPTIONS.extra_signapk_args = args.extra_signapk_args



  if args.signapk_shared_library_path:

    common.OPTIONS.signapk_shared_library_path = args.signapk_shared_library_path



  metadata_ota = args.packages[-1]

  if args.metadata_ota is not None:

    metadata_ota = args.metadata_ota

tools/releasetools/ota_signing_utils.py

+8 −0
Original line number Diff line number Diff line
@@ -23,10 +23,18 @@ def ParseSignerArgs(args): 




def AddSigningArgumentParse(parser: argparse.ArgumentParser):

  parser.add_argument('--java_path', type=str,

                      help='Path to JVM if other than default')

  parser.add_argument('--package_key', type=str,

                      help='Paths to private key for signing payload')

  parser.add_argument('--search_path', '--path', type=str,

                      help='Search path for framework/signapk.jar')

  parser.add_argument('--signapk_path', type=str,

                      help='Path to signapk.jar, relative to search_path')

  parser.add_argument('--extra_signapk_args', type=ParseSignerArgs,

                      help='Extra arguments for signapk.jar')

  parser.add_argument('--signapk_shared_library_path', type=str,

                      help='Path to lib64 libraries used by signapk.jar')

  parser.add_argument('--payload_signer', type=str,

                      help='Path to custom payload signer')

  parser.add_argument('--payload_signer_args', type=ParseSignerArgs,