changeset 1426:0c68b8f51fe7

8035302: Eliminate dependency on jdk.charsets from 2D font code. Reviewed-by: mchung, alanb, sherman, serb
author prr
date Mon, 13 Apr 2015 17:03:11 -0700
parents 8f03e7bb692b
children 3fcac0e9c5be
files make/CompileJavaModules.gmk modules.xml
diffstat 2 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Mon Apr 06 10:35:43 2015 -0700
+++ b/make/CompileJavaModules.gmk	Mon Apr 13 17:03:11 2015 -0700
@@ -162,7 +162,6 @@
       $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
       $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
       $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/motif/*.java) \
       $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
       #
 else
--- a/modules.xml	Mon Apr 06 10:35:43 2015 -0700
+++ b/modules.xml	Mon Apr 13 17:03:11 2015 -0700
@@ -604,7 +604,6 @@
     <depend>java.prefs</depend>
     <depend re-exports="true">java.xml</depend>
     <depend re-exports="true">java.datatransfer</depend>
-    <depend>jdk.charsets</depend>
     <export>
       <name>java.applet</name>
     </export>
@@ -1487,10 +1486,6 @@
   <module>
     <name>jdk.charsets</name>
     <depend>java.base</depend>
-    <export>
-      <name>sun.nio.cs.ext</name>
-      <to>java.desktop</to>
-    </export>
   </module>
   <module>
     <name>jdk.compiler</name>