Merge "Skip signing key check in some cases" am: 984ad44276 am: 165b1be894

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

Change-Id: I65d037ab1d8d3197b28e8ca6949f178ff7cdd0c2

tools/releasetools/ota_from_target_files.py

@@ -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()