Stop removing add_opens and add_exports configurations

See #19850 PiperOrigin-RevId: 574291996 Change-Id: I4c2448876c8bc7cdc6dc3cc391556771b561610d
bazelbuild · Oct 17, 2023 · 6a7e9ba · 6a7e9ba
1 parent 3ff7c32
commit 6a7e9ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/VanillaJavaBuilder.java
@@ -176,7 +176,9 @@ public VanillaJavaBuilderResult run(List<String> args) throws IOException {
                 new PrintWriter(output, true),
                 fileManager,
                 diagnosticCollector,
-                JavacOptions.removeBazelSpecificFlags(optionsParser.getJavacOpts()),
+                JavacOptions.removeBazelSpecificFlags(
+                    JavacOptions.normalizeOptionsWithNormalizers(
+                        optionsParser.getJavacOpts(), new JavacOptions.ReleaseOptionNormalizer())),
                 ImmutableList.<String>of() /*classes*/,
                 sources);
         setProcessors(optionsParser, fileManager, task);

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/BUILD
@@ -28,6 +28,9 @@ java_library(
             "CodecScanningConstants.java",
         ],
     ),
+    add_opens = [
+        "java.base/java.lang.invoke",
+    ],
     deps = [
         ":codec-scanning-constants",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:registered-singleton",

diff --git a/src/main/java/com/google/devtools/build/lib/unsafe/BUILD b/src/main/java/com/google/devtools/build/lib/unsafe/BUILD
@@ -19,5 +19,8 @@ java_library(
 java_library(
     name = "string",
     srcs = ["StringUnsafe.java"],
+    add_opens = [
+        "java.base/java.lang",
+    ],
     deps = [":unsafe-provider"],
 )