Merge pull request #20650 from pshipton/orb

Remove ORBBase, ORBVMHelpers from OpenJ9 builds
eclipse-openj9 · Nov 20, 2024 · 48709bf · 48709bf
2 parents abfb92f + 3448505
commit 48709bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java
@@ -1,4 +1,4 @@
-/*[INCLUDE-IF JAVA_SPEC_VERSION >= 8]*/
+/*[INCLUDE-IF (JAVA_SPEC_VERSION == 8) & !Sidecar18-SE-OpenJ9]*/
 /*
  * Copyright IBM Corp. and others 2010
  *

diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java
@@ -1,4 +1,4 @@
-/*[INCLUDE-IF JAVA_SPEC_VERSION >= 8]*/
+/*[INCLUDE-IF (JAVA_SPEC_VERSION == 8) & !Sidecar18-SE-OpenJ9]*/
 /*
  * Copyright IBM Corp. and others 2010
  *
@@ -28,13 +28,8 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-/*[IF JAVA_SPEC_VERSION >= 9]
-import jdk.internal.misc.Unsafe;
-import jdk.internal.reflect.CallerSensitive;
-/*[ELSE] JAVA_SPEC_VERSION >= 9 */
 import sun.reflect.CallerSensitive;
 import sun.misc.Unsafe;
-/*[ENDIF] JAVA_SPEC_VERSION >= 9 */
 
 public class ORBVMHelpers {