godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Windows] Only use long executable path when necessary, fix broken apksigner detection.

This commit is contained in:
bruvzg 2024-09-10 10:20:28 +03:00
parent 21249950da
commit 2c991a727b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/android/export/export_plugin.cpp
View File

@ -2276,6 +2276,11 @@ String EditorExportPlatformAndroid::get_apksigner_path(int p_target_sdk, bool p_
bool failed = false; bool failed = false;
String version_to_use; 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; List<String> args;
args.push_back("--version"); args.push_back("--version");
String output; String output;

2
platform/windows/os_windows.cpp
View File

@ -101,7 +101,7 @@ static String fix_path(const String &p_path) {
} }
path = path.simplify_path(); path = path.simplify_path();
path = path.replace("/", "\\"); 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; path = R"(\\?\)" + path;
} }
return path; return path;