commit c0ae029e87714d855ba438ecc38764f0b25a3a2a
author Kelvin Zhang <zhangkelvin@google.com> Mon Sep 16 11:07:25 2024 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Mon Sep 16 21:01:45 2024 +0000
tree 1d1b3ce8dfa767bf7185897ca8d780d56040fad9
parent 112c4886c7b60af80377348249ca949a699913c8

Fix missing signer arg error after re-generate OTA

sign_target_files_apks invokes ota_from_raw_img's main function directly(without creating a new process). As a result, flag overrides in  ota_from_raw_img impacts further signing. To fix, remove unnecessary flag overrides.

Test: th
Bug: 365697483
Change-Id: Iaf6ad4132afcab4912bd4b9ea002bfa3d9a1462a

tools/releasetools/ota_from_raw_img.py

diff --git a/tools/releasetools/ota_from_raw_img.py b/tools/releasetools/ota_from_raw_img.py
index 03b44f1..3b9374a 100644
--- a/tools/releasetools/ota_from_raw_img.py
+++ b/tools/releasetools/ota_from_raw_img.py
@@ -105,9 +105,6 @@
 
     if args.package_key:
       logger.info("Signing payload...")
-      # TODO: remove OPTIONS when no longer used as fallback in payload_signer
-      common.OPTIONS.payload_signer_args = None
-      common.OPTIONS.payload_signer_maximum_signature_size = None
       signer = PayloadSigner(args.package_key, args.private_key_suffix,
                              key_passwords[args.package_key],
                              payload_signer=args.payload_signer,