Update toolchain config to allow reflective access to `com.sun.tools.javac.parser`
Reported here: https://github.com/google/error-prone/issues/2271#issuecomment-1018294740
PiperOrigin-RevId: 423272568
diff --git a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
index 62f33cc..3c2191c 100644
--- a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
+++ b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
@@ -47,9 +47,9 @@
def _get_def_parser():
return attr.label(
- default = "@bazel_tools//tools/def_parser:def_parser",
- allow_single_file = True,
- cfg = "exec",
+ default = "@bazel_tools//tools/def_parser:def_parser",
+ allow_single_file = True,
+ cfg = "exec",
)
semantics = struct(
diff --git a/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl b/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
index f858068..714bf31 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_semantics.bzl
@@ -46,6 +46,7 @@
if not runner:
fail("jacocorunner not set in java_toolchain")
runner_jar = runner.executable
+
# wrap the jar in JavaInfo so we can add it to deps for java_common.compile()
return JavaInfo(output_jar = runner_jar, compile_jar = runner_jar)
diff --git a/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl b/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl
index ea15661..ee0d6db 100644
--- a/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl
+++ b/src/main/starlark/builtins_bzl/common/proto/proto_semantics.bzl
@@ -17,15 +17,15 @@
"""
def _preprocess(ctx):
- pass
+ pass
semantics = struct(
- PROTO_COMPILER_LABEL = "@com_google_protobuf//:protoc",
- EXTRA_ATTRIBUTES = {
- "import_prefix": attr.string(),
- },
- EXTRA_FRAGMENTS = [],
- preprocess = _preprocess,
+ PROTO_COMPILER_LABEL = "@com_google_protobuf//:protoc",
+ EXTRA_ATTRIBUTES = {
+ "import_prefix": attr.string(),
+ },
+ EXTRA_FRAGMENTS = [],
+ preprocess = _preprocess,
# This constant is used in ProtoCompileActionBuilder to generate an error message that's
# displayed when a strict proto deps violation occurs.
#
@@ -36,4 +36,4 @@
"--direct_dependencies_violation_msg=" +
"%%s is imported, but %s doesn't directly depend on a proto_library that 'srcs' it."
),
- )
\ No newline at end of file
+)
diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index ac8ed5d..14479d4 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -24,7 +24,6 @@
"--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
- "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.resources=ALL-UNNAMED",
"--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
@@ -32,6 +31,7 @@
"--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+ "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
# quiet warnings from com.google.protobuf.UnsafeUtil,
# see: https://github.com/google/protobuf/issues/3781
