make/CreateJars.gmk

*** 158,172 ****
--- 158,174 ----
      javax/swing/JToolBarBeanInfo.class \
      javax/swing/JTreeBeanInfo.class \
      javax/swing/JWindowBeanInfo.class \
      javax/swing/SwingBeanInfoBase.class \
      javax/swing/text/JTextComponentBeanInfo.class \
+     jdk/nio/zipfs \
      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/sun.net.spi.nameservice.NameServiceDescriptor \
+     META-INF/services/java.nio.file.spi.FileSystemProvider \
      org/relaxng/datatype \
      sun/awt/HKSCS.class \
      sun/awt/motif/X11GB2312.class \
      sun/awt/motif/X11GB2312\$$$$Decoder.class \
      sun/awt/motif/X11GB2312\$$$$Encoder.class \
*** 354,363 ****
--- 356,375 ----
      SKIP_METAINF := true, \
      CHECK_COMPRESS_JAR := true))
  
  ##########################################################################################
  
+ $(eval $(call SetupArchive,BUILD_ZIPFS_JAR, , \
+     SRCS := $(JDK_OUTPUTDIR)/classes, \
+     INCLUDES := jdk/nio/zipfs, \
+     EXTRA_FILES := META-INF/services/java.nio.file.spi.FileSystemProvider, \
+     JAR := $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar, \
+     SKIP_METAINF := true, \
+     CHECK_COMPRESS_JAR := true))
+ 
+ ##########################################################################################
+ 
  ifndef OPENJDK
    ifeq ($(ENABLE_JFR), true)
      $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
          SRCS := $(JDK_OUTPUTDIR)/classes, \
          SUFFIXES := .class .jfc .xsd, \
*** 658,672 ****
  $(IMAGES_OUTPUTDIR)/lib/management-agent.jar: $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
          $(JAR) cfm $@ $<
  
  ##########################################################################################
  
- $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar: $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
-         $(install-file)
- 
- ##########################################################################################
- 
  # This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
  # all jars can be found in one place when creating images in Images.gmk. It needs to be
  # done here so that clean targets can be simple and accurate.
  $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar
          $(install-file)
--- 670,679 ----