From c0ae029e87714d855ba438ecc38764f0b25a3a2a Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Mon, 16 Sep 2024 11:07:25 -0700 Subject: [PATCH] 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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/releasetools/ota_from_raw_img.py b/tools/releasetools/ota_from_raw_img.py index 03b44f15d6..3b9374ab13 100644 --- a/tools/releasetools/ota_from_raw_img.py +++ b/tools/releasetools/ota_from_raw_img.py @@ -105,9 +105,6 @@ def main(argv): 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,