From 6b7f36e2a99aec6edd869eb9b9e8ec4f74b56f4e Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:20:28 +0300
Subject: [PATCH] [Windows] Fix broken apksigner detection.

(cherry picked from commit 2c991a727b1ff94fa5adca3a5a196ffa1162f98d)
---
 platform/android/export/export_plugin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index 5169b9417f6..6a17dc8bf60 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;