# HG changeset patch
# User prr
# Date 1428969791 25200
# Node ID 0b4d565ae7c0b74150ab8e97c21aab776f2aa6b8
# Parent  427f83353f732c86e3944866b64b7821428f06d9
8035302: Eliminate dependency on jdk.charsets from 2D font code.
Reviewed-by: mchung, alanb, sherman, serb

diff -r 427f83353f73 -r 0b4d565ae7c0 make/CompileJavaModules.gmk
--- 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
diff -r 427f83353f73 -r 0b4d565ae7c0 modules.xml
--- 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>