make/JrtfsJar.gmk

*** 1,7 ****
  #
! # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # 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
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # 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
  # published by the Free Software Foundation.  Oracle designates this
*** 44,65 ****
  JIMAGE_PKGS := \
      jdk/internal/jimage \
      jdk/internal/jrtfs \
      #
  
! $(eval $(call SetupJavaCompilation,BUILD_JRTFS, \
      SETUP := GENERATE_OLDBYTECODE, \
      SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
      EXCLUDE_FILES := module-info.java, \
      INCLUDES := $(JIMAGE_PKGS), \
      BIN := $(SUPPORT_OUTPUTDIR)/jrtfs_classes))
  
  # Because of the explicit INCLUDES in the compilation setup above, the service provider
  # file will not be copied unless META-INF/services would also be added to the INCLUDES.
  # Adding META-INF/services would include all files in that directory when only the one
  # is needed, which is why this explicit copy is defined instead.
! $(eval $(call SetupCopyFiles,COPY_JIMAGE_SERVICE_PROVIDER, \
      SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
      DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
      FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
  
  $(eval $(call SetupJarArchive,BUILD_JRTFS_JAR, \
--- 44,65 ----
  JIMAGE_PKGS := \
      jdk/internal/jimage \
      jdk/internal/jrtfs \
      #
  
! $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
      SETUP := GENERATE_OLDBYTECODE, \
      SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
      EXCLUDE_FILES := module-info.java, \
      INCLUDES := $(JIMAGE_PKGS), \
      BIN := $(SUPPORT_OUTPUTDIR)/jrtfs_classes))
  
  # Because of the explicit INCLUDES in the compilation setup above, the service provider
  # file will not be copied unless META-INF/services would also be added to the INCLUDES.
  # Adding META-INF/services would include all files in that directory when only the one
  # is needed, which is why this explicit copy is defined instead.
! $(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
      SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
      DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
      FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
  
  $(eval $(call SetupJarArchive,BUILD_JRTFS_JAR, \