Automated rollback of commit 1824a5548e56ecd337687ff32baf98e37ddd6b16. *** Reason for rollback *** Breaks Bazel tests *** Original change description *** Add `--sun-misc-unsafe-memory-access=allow` to `JavaBuilder`'s jvm flags Fixes https://github.com/bazelbuild/rules_java/issues/348 PiperOrigin-RevId: 868102114 Change-Id: If58378b00718c8ca3a04d2559801c8540c006ad6
diff --git a/test/toolchains/BUILD.bazel b/test/toolchains/BUILD.bazel index 24ae535..e25b3d8 100644 --- a/test/toolchains/BUILD.bazel +++ b/test/toolchains/BUILD.bazel
@@ -1,8 +1,7 @@ load(":bootclasspath_tests.bzl", "bootclasspath_tests") -load(":default_java_toolchain_tests.bzl", "default_java_toolchain_tests") package(default_applicable_licenses = ["@rules_java//:license"]) -bootclasspath_tests(name = "bootclasspath_tests") - -default_java_toolchain_tests(name = "default_java_toolchain_tests") +bootclasspath_tests( + name = "bootclasspath_tests", +)
diff --git a/test/toolchains/default_java_toolchain_tests.bzl b/test/toolchains/default_java_toolchain_tests.bzl deleted file mode 100644 index bdfa400..0000000 --- a/test/toolchains/default_java_toolchain_tests.bzl +++ /dev/null
@@ -1,30 +0,0 @@ -"""Tests for the default java toolchain configuration""" - -load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") -load("@rules_testing//lib:util.bzl", "util") -load("//java:java_library.bzl", "java_library") - -def _test_java_builder_jvm_flags(name): - util.helper_target( - java_library, - name = name + "/lib", - srcs = ["A.java"], - ) - analysis_test( - name = name, - impl = _test_java_builder_jvm_flags_impl, - target = name + "/lib", - ) - -def _test_java_builder_jvm_flags_impl(env, target): - env.expect.that_target(target).action_named("Javac").contains_flag_values([ - ("--sun-misc-unsafe-memory-access", "allow"), - ]) - -def default_java_toolchain_tests(name): - test_suite( - name = name, - tests = [ - _test_java_builder_jvm_flags, - ], - )
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl index df53468..f4f83f6 100644 --- a/toolchains/default_java_toolchain.bzl +++ b/toolchains/default_java_toolchain.bzl
@@ -103,8 +103,6 @@ # targeting JDK 7. java_runtime = Label("//toolchains:remotejdk_21"), oneversion = Label("//toolchains:one_version"), - # TODO: remove after https://github.com/protocolbuffers/protobuf/issues/20760 is fixed - javabuilder_jvm_opts = ["--sun-misc-unsafe-memory-access=allow"], ) DEFAULT_TOOLCHAIN_CONFIGURATION = _BASE_TOOLCHAIN_CONFIGURATION