summaryrefslogtreecommitdiffstats
path: root/platform/android/export
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2024-09-10 10:20:28 +0300
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2024-09-10 10:34:44 +0300
commit2c991a727b1ff94fa5adca3a5a196ffa1162f98d (patch)
tree2aa14fce14f1f9198c0b62d3aa14d0bba1d2a516 /platform/android/export
parent21249950da50e094b141f73646fd477d7832c8db (diff)
downloadredot-engine-2c991a727b1ff94fa5adca3a5a196ffa1162f98d.tar.gz
[Windows] Only use long executable path when necessary, fix broken apksigner detection.
Diffstat (limited to 'platform/android/export')
-rw-r--r--platform/android/export/export_plugin.cpp5
1 files changed, 5 insertions, 0 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;