asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #94809 from ChrisBase/fix_keytool_for_android_export_not_found

Browse source 
Fix Android export failing with custom keystores and no JDK setup in the OS environment
This commit is contained in:
Rémi Verschelde 2024-07-28 17:46:42 +02:00
commit 8239eac5d9
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 1 deletions
Show stats 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("-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;