Extend merge_ota with extra options for signapk.jar
Add the same parameters for supporting custom signapk.jar
to merge_ota as already supported by ota_from_targetfiles
introduced in: a28acc6972ce35e9dfab061f175e229859d3e4db
This makes it possible for an oem to use a custom signapk.jar
for the package signing when using merge_ota.
Bug: 384969259
Test: local
Change-Id: Ia2713f5b0007d6aee34d9546396d744fb5fe6943
diff --git a/tools/releasetools/merge_ota.py b/tools/releasetools/merge_ota.py
index fb5957a..e8732a2 100644
--- a/tools/releasetools/merge_ota.py
+++ b/tools/releasetools/merge_ota.py
@@ -226,9 +226,21 @@
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