Skip to content

Commit

Permalink
Update to only export to openjceplus on supported platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
taoliult committed Dec 3, 2023
1 parent 6b0a402 commit 97cc6d5
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
1 change: 1 addition & 0 deletions closed/GensrcJ9JCL.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \
src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java \
src/java.base/share/classes/jdk/internal/access/JavaNetInetAddressAccess.java \
src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java \
src/java.base/share/classes/module-info.java \
src/java.base/share/classes/sun/security/jca/ProviderConfig.java \
src/java.base/share/classes/sun/security/jca/ProviderList.java \
src/java.base/unix/classes/java/lang/ProcessEnvironment.java \
Expand Down
3 changes: 2 additions & 1 deletion closed/custom/Images-pre.gmk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ===========================================================================
# (c) Copyright IBM Corp. 2020, 2021 All Rights Reserved
# (c) Copyright IBM Corp. 2020, 2023 All Rights Reserved
# ===========================================================================
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
Expand All @@ -24,4 +24,5 @@ JRE_MODULES += \
openj9.dataaccess \
openj9.dtfj \
openj9.gpu \
$(if $(call equals, $(BUILD_OPENJCEPLUS), true), openjceplus) \
#
23 changes: 22 additions & 1 deletion src/java.base/share/classes/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
* (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
* ===========================================================================
*/

Expand Down Expand Up @@ -182,6 +182,9 @@
jdk.compiler,
jdk.jlink;
exports jdk.internal.logger to
/*[IF OPENJCEPLUS_SUPPORT]*/
openjceplus,
/*[ENDIF] OPENJCEPLUS_SUPPORT */
java.logging;
exports jdk.internal.org.objectweb.asm to
jdk.jartool,
Expand All @@ -199,6 +202,9 @@
exports jdk.internal.org.xml.sax.helpers to
jdk.jfr;
exports jdk.internal.misc to
/*[IF OPENJCEPLUS_SUPPORT]*/
openjceplus,
/*[ENDIF] OPENJCEPLUS_SUPPORT */
java.desktop,
java.logging,
java.management,
Expand Down Expand Up @@ -279,6 +285,9 @@
jdk.jconsole,
jdk.sctp;
exports sun.net.www to
/*[IF OPENJCEPLUS_SUPPORT]*/
openjceplus,
/*[ENDIF] OPENJCEPLUS_SUPPORT */
java.net.http,
jdk.jartool;
exports sun.net.www.protocol.http to
Expand Down Expand Up @@ -310,8 +319,14 @@
jdk.crypto.ec,
jdk.incubator.foreign;
exports sun.security.internal.interfaces to
/*[IF OPENJCEPLUS_SUPPORT]*/
openjceplus,
/*[ENDIF] OPENJCEPLUS_SUPPORT */
jdk.crypto.cryptoki;
exports sun.security.internal.spec to
/*[IF OPENJCEPLUS_SUPPORT]*/
openjceplus,
/*[ENDIF] OPENJCEPLUS_SUPPORT */
jdk.crypto.cryptoki;
exports sun.security.jca to
java.smartcardio,
Expand All @@ -337,6 +352,9 @@
exports sun.security.tools to
jdk.jartool;
exports sun.security.util to
/*[IF OPENJCEPLUS_SUPPORT]*/
openjceplus,
/*[ENDIF] OPENJCEPLUS_SUPPORT */
java.desktop,
java.naming,
java.rmi,
Expand Down Expand Up @@ -366,6 +384,9 @@
jdk.jlink,
jdk.localedata;
exports sun.util.logging to
/*[IF OPENJCEPLUS_SUPPORT]*/
openjceplus,
/*[ENDIF] OPENJCEPLUS_SUPPORT */
java.desktop,
java.logging,
java.prefs;
Expand Down

0 comments on commit 97cc6d5

Please sign in to comment.