makefiles/CreateJars.gmk

*** 199,209 ****
          javax/swing/text/JTextComponentBeanInfo.class \
          META-INF/services/com.sun.jdi.connect.Connector \
          META-INF/services/com.sun.jdi.connect.spi.TransportService \
          META-INF/services/com.sun.tools.attach.spi.AttachProvider \
          META-INF/services/com.sun.tools.xjc.Plugin \
-         META-INF/services/java.nio.charset.spi.CharsetProvider \
          META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
          org/relaxng/datatype \
          sun/awt/HKSCS.class \
          sun/awt/motif/X11GB2312.class \
          sun/awt/motif/X11GB2312\$$$$Decoder.class \
--- 199,208 ----
*** 426,437 ****
  $(eval $(call SetupArchive,BUILD_CHARSETS_JAR,,\
                  SRCS:=$(JDK_OUTPUTDIR)/classes, \
                  SUFFIXES:=.class .dat,\
                  INCLUDES:=sun/nio/cs/ext,\
                  EXTRA_FILES := sun/awt/HKSCS.class \
!                                $(CHARSETS_EXTRA_FILES) \
!                                META-INF/services/java.nio.charset.spi.CharsetProvider, \
                  JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
                  SKIP_METAINF := true, \
                  CHECK_COMPRESS_JAR:=true))
  
  ##########################################################################################
--- 425,435 ----
  $(eval $(call SetupArchive,BUILD_CHARSETS_JAR,,\
                  SRCS:=$(JDK_OUTPUTDIR)/classes, \
                  SUFFIXES:=.class .dat,\
                  INCLUDES:=sun/nio/cs/ext,\
                  EXTRA_FILES := sun/awt/HKSCS.class \
!                                $(CHARSETS_EXTRA_FILES), \
                  JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
                  SKIP_METAINF := true, \
                  CHECK_COMPRESS_JAR:=true))
  
  ##########################################################################################