diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-12 16:45:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 16:45:44 +0100 |
| commit | cd93bb913040cc06dd49ade51cd7d367b433a9ce (patch) | |
| tree | 255cd7c502f2d9315ab829bbb15f8c94ee28d13c | |
| parent | a7839df8698058ae207929d7542ef75a0954104b (diff) | |
| parent | 3e288f65bbb808087d5644246d5118c1d3244e16 (diff) | |
Merge pull request #56673 from winterpixelgames/bugfix-android-keystore-paths
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index cbecde787f..aa44183329 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2666,6 +2666,13 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP debug_password = EditorSettings::get_singleton()->get("export/android/debug_keystore_pass"); debug_user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user"); } + if (debug_keystore.is_relative_path()) { + debug_keystore = OS::get_singleton()->get_resource_dir().plus_file(debug_keystore).simplify_path(); + } + if (!FileAccess::exists(debug_keystore)) { + EditorNode::add_io_error(TTR("Could not find keystore, unable to export.")); + return ERR_FILE_CANT_OPEN; + } cmdline.push_back("-Pdebug_keystore_file=" + debug_keystore); // argument to specify the debug keystore file. cmdline.push_back("-Pdebug_keystore_alias=" + debug_user); // argument to specify the debug keystore alias. @@ -2675,6 +2682,9 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP String release_keystore = p_preset->get("keystore/release"); String release_username = p_preset->get("keystore/release_user"); String release_password = p_preset->get("keystore/release_password"); + if (release_keystore.is_relative_path()) { + release_keystore = OS::get_singleton()->get_resource_dir().plus_file(release_keystore).simplify_path(); + } if (!FileAccess::exists(release_keystore)) { EditorNode::add_io_error(TTR("Could not find keystore, unable to export.")); return ERR_FILE_CANT_OPEN; |