Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-03 23:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Android export failing when no JDK is setup in the OS environment and custom keystores have been set in the export dialog.

Browse source
This commit is contained in:
Chris 2024-07-26 18:59:00 +02:00
parent 607b230ffe
commit 7afefe6469
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
platform/android/export/export_plugin.cpp
View file

@ -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(p_password);
args.push_back("-alias"); args.push_back("-alias");
args.push_back(p_username); 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:"; String keytool_error = "keytool error:";
bool valid = output.substr(0, keytool_error.length()) != keytool_error; bool valid = output.substr(0, keytool_error.length()) != keytool_error;