| commit | 3f70ca11ca0f33f71544b1ea43e59995d6cc5f01 | [log] [tgz] |
|---|---|---|
| author | Googler <cushon@google.com> | Fri Oct 25 11:45:52 2024 -0700 |
| committer | Copybara-Service <copybara-worker@google.com> | Fri Oct 25 11:47:16 2024 -0700 |
| tree | 8a2397ffdfe37472cfe66e9d81d285fca67b46a6 | |
| parent | 1bb31854200a67941edf9e3d9cc036432c00a7a2 [diff] |
If both `java_library` and `java_package_configuration` override the bootclasspath, the java_library override should be used Follow-up to https://github.com/bazelbuild/bazel/commit/d12959c617164671ff9a2606d863e077f6e2932c PiperOrigin-RevId: 689861371 Change-Id: If89f9d425e7b6559c1634bae867af8025faa62ec
diff --git a/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl b/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl index d052c93..e9115d8 100644 --- a/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl +++ b/src/main/starlark/builtins_bzl/common/java/java_common_internal_for_builtins.bzl
@@ -134,15 +134,16 @@ ["-Abazel.repository=" + ctx.label.workspace_name], order = "preorder", )) - system_override = False + system_bootclasspath = None for package_config in java_toolchain._package_configuration: if package_config.matches(ctx.label): all_javac_opts.append(package_config.javac_opts) if package_config.system: - if system_override: + if system_bootclasspath: fail("Multiple system package configurations found for %s" % ctx.label) - bootclasspath = package_config.system - system_override = True + system_bootclasspath = package_config.system + if not bootclasspath: + bootclasspath = system_bootclasspath all_javac_opts.append(depset( ["--add-exports=%s=ALL-UNNAMED" % x for x in add_exports],