Skip to content

Commit aa4075b

Browse files
hvadehrarules_java Copybara
authored andcommitted
Automated rollback of commit 1824a55.
*** Reason for rollback *** Breaks Bazel tests *** Original change description *** Add `--sun-misc-unsafe-memory-access=allow` to `JavaBuilder`'s jvm flags Fixes #348 PiperOrigin-RevId: 868102114 Change-Id: If58378b00718c8ca3a04d2559801c8540c006ad6
1 parent aade08e commit aa4075b

3 files changed

Lines changed: 3 additions & 36 deletions

File tree

test/toolchains/BUILD.bazel

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
load(":bootclasspath_tests.bzl", "bootclasspath_tests")
2-
load(":default_java_toolchain_tests.bzl", "default_java_toolchain_tests")
32

43
package(default_applicable_licenses = ["@rules_java//:license"])
54

6-
bootclasspath_tests(name = "bootclasspath_tests")
7-
8-
default_java_toolchain_tests(name = "default_java_toolchain_tests")
5+
bootclasspath_tests(
6+
name = "bootclasspath_tests",
7+
)

test/toolchains/default_java_toolchain_tests.bzl

Lines changed: 0 additions & 30 deletions
This file was deleted.

toolchains/default_java_toolchain.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ _BASE_TOOLCHAIN_CONFIGURATION = dict(
103103
# targeting JDK 7.
104104
java_runtime = Label("//toolchains:remotejdk_21"),
105105
oneversion = Label("//toolchains:one_version"),
106-
# TODO: remove after https://github.com/protocolbuffers/protobuf/issues/20760 is fixed
107-
javabuilder_jvm_opts = ["--sun-misc-unsafe-memory-access=allow"],
108106
)
109107

110108
DEFAULT_TOOLCHAIN_CONFIGURATION = _BASE_TOOLCHAIN_CONFIGURATION

0 commit comments

Comments
 (0)