From 39070291ef8154eb90ccbdf56fa68fe47516d7dd Mon Sep 17 00:00:00 2001 From: Jason Knight Date: Mon, 10 Jan 2022 14:34:00 -0600 Subject: [PATCH] Android export plugin passes absolute file paths to gradle for keystores. --- platform/android/export/export_plugin.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index aac14fe4aec..ce1dac2936a 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2985,6 +2985,13 @@ Error EditorExportPlatformAndroid::export_project_helper(const Refget("export/android/debug_keystore_pass"); debug_user = EditorSettings::get_singleton()->get("export/android/debug_keystore_user"); } + if (debug_keystore.is_rel_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. @@ -2994,6 +3001,9 @@ Error EditorExportPlatformAndroid::export_project_helper(const Refget("keystore/release"); String release_username = p_preset->get("keystore/release_user"); String release_password = p_preset->get("keystore/release_password"); + if (release_keystore.is_rel_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;