commit d3f34085e87d436e12e1df2fa2d018cba59d0e2b
author Googler <ilist@google.com> Wed Jun 25 08:39:51 2025 -0700
committer rules_java Copybara <noreply@google.com> Wed Jun 25 08:40:34 2025 -0700
tree 648c9c1a03550503ae991f6fd9c8b06d03404b9a
parent 3daed1aeb1baa4d8867119785d60b50be4aa8b40

Make C++ toolchain explicitly not mandatory

Fixes: https://github.com/bazelbuild/rules_java/issues/305
PiperOrigin-RevId: 775703888
Change-Id: I709ccc8f29a09470aa3c4653ce9e1c413fafbbe4

java/bazel/rules/bazel_java_binary.bzl

diff --git a/java/bazel/rules/bazel_java_binary.bzl b/java/bazel/rules/bazel_java_binary.bzl
index cbbe0de..da54722 100644
--- a/java/bazel/rules/bazel_java_binary.bzl
+++ b/java/bazel/rules/bazel_java_binary.bzl
@@ -317,7 +317,7 @@
         test = test,
         fragments = ["cpp", "java"],
         provides = [JavaInfo],
-        toolchains = [semantics.JAVA_TOOLCHAIN] + use_cc_toolchain() + (
+        toolchains = [semantics.JAVA_TOOLCHAIN] + use_cc_toolchain(mandatory = False) + (
             [semantics.JAVA_RUNTIME_TOOLCHAIN] if executable or test else []
         ) + (
             [_LAUNCHER_MAKER_TOOLCHAIN] if bazel_features.rules._has_launcher_maker_toolchain else []
@@ -331,7 +331,7 @@
             "unstrippeddeployjar": "%{name}_deploy.jar.unstripped",
         },
         exec_groups = {
-            "cpp_link": exec_group(toolchains = use_cc_toolchain()),
+            "cpp_link": exec_group(toolchains = use_cc_toolchain(mandatory = False)),
         },
         subrules = [android_lint_subrule],
     )