diff options
| author | Chris <9290150+ChrisBase@users.noreply.github.com> | 2024-07-26 18:59:00 +0200 |
|---|---|---|
| committer | Chris <9290150+ChrisBase@users.noreply.github.com> | 2024-07-27 01:33:59 +0200 |
| commit | 7afefe64694dcc54cb8cd24c19f50662bf3ca5d6 (patch) | |
| tree | 4ff3d7fac699a6ea3e9e2b82feb06b22d0e1cb8c /platform | |
| parent | 607b230ffe120b2757c56bd3d52a7a0d4e502cfe (diff) | |
| download | redot-engine-7afefe64694dcc54cb8cd24c19f50662bf3ca5d6.tar.gz | |
Fixed Android export failing when no JDK is setup in the OS environment and custom keystores have been set in the export dialog.
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; |