Stop removing add_opens and add_exports configurations

cushon · copybara-github · commit 6a7e9ba0c99a · 2023-10-17T16:05:45.000-07:00
See bazelbuild#19850 PiperOrigin-RevId: 574291996 Change-Id: I4c2448876c8bc7cdc6dc3cc391556771b561610d
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"],
 )

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,8 @@ java_library(`
`19`	`19`	`java_library(`
`20`	`20`	`name = "string",`
`21`	`21`	`srcs = ["StringUnsafe.java"],`
	`22`	`+ add_opens = [`
	`23`	`+ "java.base/java.lang",`
	`24`	`+ ],`
`22`	`25`	`deps = [":unsafe-provider"],`
`23`	`26`	`)`