diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-10 09:51:34 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-10 09:51:34 +0200 |
| commit | 444683bd09d5e548a6e6057c1ef53a46e89e5efa (patch) | |
| tree | 7cdb7456ebd44af3ba3f99a1da161f3be13be605 | |
| parent | 1a51637732059d6cbc7f62a4057ad3bdaec472eb (diff) | |
| parent | 2c991a727b1ff94fa5adca3a5a196ffa1162f98d (diff) | |
| download | redot-engine-444683bd09d5e548a6e6057c1ef53a46e89e5efa.tar.gz | |
Merge pull request #96777 from bruvzg/and_exp_win
[Windows] Only use long executable path when necessary, fix broken apksigner detection.
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 5 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index f8ac591a78..d78f8db79c 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2276,6 +2276,11 @@ String EditorExportPlatformAndroid::get_apksigner_path(int p_target_sdk, bool p_ bool failed = false; String version_to_use; + String java_sdk_path = EDITOR_GET("export/android/java_sdk_path"); + if (!java_sdk_path.is_empty()) { + OS::get_singleton()->set_environment("JAVA_HOME", java_sdk_path); + } + List<String> args; args.push_back("--version"); String output; diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index f9c636a4a6..e6e8c6aaef 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -101,7 +101,7 @@ static String fix_path(const String &p_path) { } path = path.simplify_path(); path = path.replace("/", "\\"); - if (!path.is_network_share_path() && !path.begins_with(R"(\\?\)")) { + if (path.size() >= MAX_PATH && !path.is_network_share_path() && !path.begins_with(R"(\\?\)")) { path = R"(\\?\)" + path; } return path; |