From bf250fd5a297b27f693e5cdae32d5e6e03aaf028 Mon Sep 17 00:00:00 2001
From: kisabaka <648530+kisabaka@users.noreply.github.com>
Date: Thu, 7 May 2026 00:42:51 +0200
Subject: [PATCH 1/3] Correctly reference binaries on Windows

---
 rules/android_sdk_repository/helper.bzl | 18 ++++++++++--------
 rules/java.bzl                          |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/rules/android_sdk_repository/helper.bzl b/rules/android_sdk_repository/helper.bzl
index d6053d953..22a9cb2ac 100644
--- a/rules/android_sdk_repository/helper.bzl
+++ b/rules/android_sdk_repository/helper.bzl
@@ -209,10 +209,7 @@ def create_android_sdk_rules(
                 ":windows": "build-tools/%s/aapt.exe" % build_tools_directory,
                 "//conditions:default": ":aapt_binary",
             }),
-            aapt2 = select({
-                ":windows": "build-tools/%s/aapt2.exe" % build_tools_directory,
-                "//conditions:default": ":aapt2_binary",
-            }),
+            aapt2 = ":aapt2",
             adb = select({
                 ":windows": "platform-tools/adb.exe",
                 "//conditions:default": "platform-tools/adb",
@@ -239,10 +236,7 @@ def create_android_sdk_rules(
             }),
             # See https://github.com/bazelbuild/bazel/issues/8757
             tags = ["__ANDROID_RULES_MIGRATION__"],
-            zipalign = select({
-                ":windows": "build-tools/%s/zipalign.exe" % build_tools_directory,
-                "//conditions:default": ":zipalign_binary",
-            }),
+            zipalign = ":zipalign",
         )
 
         native.toolchain(
@@ -356,6 +350,14 @@ def create_android_sdk_rules(
         }),
     )
 
+    native.alias(
+        name = "zipalign",
+        actual = select({
+            ":windows": "build-tools/%s/zipalign.exe" % build_tools_directory,
+            "//conditions:default": ":zipalign_binary",
+        }),
+    )
+
     native.alias(
         name = "fail",
         actual = select({
diff --git a/rules/java.bzl b/rules/java.bzl
index 5259508e1..d28cd467c 100644
--- a/rules/java.bzl
+++ b/rules/java.bzl
@@ -464,7 +464,7 @@ def _run(
 
     # Set reasonable max heap default. Required to prevent runaway memory usage.
     # Can still be overridden by callers of this method.
-    jvm_flags = ["-Xms3G", "-Xmx3G", "-XX:+ExitOnOutOfMemoryError"] + jvm_flags
+    jvm_flags = ["-Xms512M", "-Xmx3G", "-XX:+ExitOnOutOfMemoryError"] + jvm_flags
 
     # executable should be a File or a FilesToRunProvider
     jar = args.get("executable")

From f525b10416e7a2d6bfc326e81e4bdaac653a3692 Mon Sep 17 00:00:00 2001
From: kisabaka <648530+kisabaka@users.noreply.github.com>
Date: Fri, 8 May 2026 13:30:26 +0200
Subject: [PATCH 2/3] Undo -Xmx change pending further investigation.

---
 rules/java.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/java.bzl b/rules/java.bzl
index d28cd467c..bdd999830 100644
--- a/rules/java.bzl
+++ b/rules/java.bzl
@@ -464,7 +464,7 @@ def _run(
 
     # Set reasonable max heap default. Required to prevent runaway memory usage.
     # Can still be overridden by callers of this method.
-    jvm_flags = ["-Xms512M", "-Xmx3G", "-XX:+ExitOnOutOfMemoryError"] + jvm_flags
+    jvm_flags = ["-Xmx3G", "-Xmx3G", "-XX:+ExitOnOutOfMemoryError"] + jvm_flags
 
     # executable should be a File or a FilesToRunProvider
     jar = args.get("executable")

From b43d6d2c7f2284063a98df6ed7d39581ab173137 Mon Sep 17 00:00:00 2001
From: kisabaka <648530+kisabaka@users.noreply.github.com>
Date: Fri, 8 May 2026 13:31:38 +0200
Subject: [PATCH 3/3] Undo -Xmx change pending further investigation.

---
 rules/java.bzl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/java.bzl b/rules/java.bzl
index bdd999830..5259508e1 100644
--- a/rules/java.bzl
+++ b/rules/java.bzl
@@ -464,7 +464,7 @@ def _run(
 
     # Set reasonable max heap default. Required to prevent runaway memory usage.
     # Can still be overridden by callers of this method.
-    jvm_flags = ["-Xmx3G", "-Xmx3G", "-XX:+ExitOnOutOfMemoryError"] + jvm_flags
+    jvm_flags = ["-Xms3G", "-Xmx3G", "-XX:+ExitOnOutOfMemoryError"] + jvm_flags
 
     # executable should be a File or a FilesToRunProvider
     jar = args.get("executable")