Skip to content

Commit

Permalink
Fixed Android export failing when no JDK is setup in the OS environme…
Browse files Browse the repository at this point in the history
…nt and custom keystores have been set in the export dialog.
  • Loading branch information
ChrisBase committed Jul 26, 2024
1 parent 607b230 commit 7afefe6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion platform/android/export/export_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2323,7 +2323,8 @@ static bool has_valid_keystore_credentials(String &r_error_str, const String &p_
args.push_back(p_password);
args.push_back("-alias");
args.push_back(p_username);
Error error = OS::get_singleton()->execute("keytool", args, &output, nullptr, true);
String keytool_path = EditorExportPlatformAndroid::get_keytool_path();
Error error = OS::get_singleton()->execute(keytool_path, args, &output, nullptr, true);
String keytool_error = "keytool error:";
bool valid = output.substr(0, keytool_error.length()) != keytool_error;

Expand Down

0 comments on commit 7afefe6

Please sign in to comment.