diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-28 17:46:42 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-28 17:46:42 +0200 |
| commit | 8239eac5d9cf86d970e7c57359a2e3ab9f4c16a7 (patch) | |
| tree | f9fbb46207500d223e63fe234458bc93bbc05bac /platform | |
| parent | e773f8c3ba402c09535f10b7230476cb6c79e43d (diff) | |
| parent | 7afefe64694dcc54cb8cd24c19f50662bf3ca5d6 (diff) | |
| download | redot-engine-8239eac5d9cf86d970e7c57359a2e3ab9f4c16a7.tar.gz | |
Merge pull request #94809 from ChrisBase/fix_keytool_for_android_export_not_found
Fix Android export failing with custom keystores and no JDK setup in the OS environment
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index a0da9019c6..5169b9417f 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -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; |