godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix apksigner execution failure on linux

This commit is contained in:
Muller-Castro 2025-01-29 23:32:04 -03:00
parent ee4acfbfbf
commit e2ece6ffb2
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2431,6 +2431,20 @@ String EditorExportPlatformAndroid::get_apksigner_path(int p_target_sdk, bool p_
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);
#ifdef UNIX_ENABLED
// Check for the `java` command.
String java_path = get_java_path();
if (!FileAccess::exists(java_path)) {
print_error("Unable to find 'java' command using the Java SDK path specified in Editor Settings.");
return "<FAILED>";
} else {
String env_path = OS::get_singleton()->get_environment("PATH");
if (!env_path.contains(java_sdk_path)) {
OS::get_singleton()->set_environment("PATH", java_sdk_path + "/bin:" + env_path);
}
}
#endif
}
List<String> args;