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

Commit 984ad442 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Skip signing key check in some cases"

parents 8bd19a41 4b588cf7
Loading
Loading
Loading
Loading
+55 −53
Original line number Diff line number Diff line
@@ -1475,6 +1475,11 @@ def main(argv):
          "build/make/target/product/security/testkey")
    # Get signing keys
    OPTIONS.key_passwords = common.GetKeyPasswords([OPTIONS.package_key])

    # Only check for existence of key file if using the default signer.
    # Because the custom signer might not need the key file AT all.
    # b/191704641
    if not OPTIONS.signapk_path:
      private_key_path = OPTIONS.package_key + OPTIONS.private_key_suffix
      if not os.path.exists(private_key_path):
        raise common.ExternalError(
@@ -1533,8 +1538,5 @@ if __name__ == '__main__':
  try:
    common.CloseInheritedPipes()
    main(sys.argv[1:])
  except common.ExternalError:
    logger.exception("\n   ERROR:\n")
    sys.exit(1)
  finally:
    common.Cleanup()