summaryrefslogtreecommitdiffstats
path: root/platform
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2024-09-10 10:20:28 +0300
committerRémi Verschelde <rverschelde@gmail.com>2024-09-17 08:57:44 +0200
commit6b7f36e2a99aec6edd869eb9b9e8ec4f74b56f4e (patch)
tree346ee1e080fcecb4ce4902d718e7327cf0390d05 /platform
parentf757cc9a70e2f8c1b385db76543ffb0eae87a4f7 (diff)
downloadredot-engine-6b7f36e2a99aec6edd869eb9b9e8ec4f74b56f4e.tar.gz
[Windows] Fix broken apksigner detection.
(cherry picked from commit 2c991a727b1ff94fa5adca3a5a196ffa1162f98d)
Diffstat (limited to 'platform')
-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 5169b9417f..6a17dc8bf6 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -2272,6 +2272,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;