Skip to content

Correctly reference binaries on Windows #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kisabaka wants to merge 3 commits into
base: main
Choose a base branch
from
+10 −8
Open

Correctly reference binaries on Windows #494

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf250fd
Correctly reference binaries on Windows
kisabaka May 6, 2026
f525b10
Undo -Xmx change pending further investigation.
kisabaka May 8, 2026
b43d6d2
Undo -Xmx change pending further investigation.
kisabaka May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions rules/android_sdk_repository/helper.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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(
Expand Down Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion rules/java.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
kisabaka marked this conversation as resolved.
Outdated

# executable should be a File or a FilesToRunProvider
jar = args.get("executable")
Expand Down