From 28d199d088809fc5498a4ada2dd9bb95f87d921f Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Wed, 11 Feb 2015 09:59:30 +0100 Subject: [PATCH] 8072834: jrt-fs.jar missing META-INF/services/java.nio.file.spi.FileSystemProvider Reviewed-by: ihse --- jdk/make/Tools.gmk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jdk/make/Tools.gmk b/jdk/make/Tools.gmk index 32174efec0c..0165341c491 100644 --- a/jdk/make/Tools.gmk +++ b/jdk/make/Tools.gmk @@ -147,6 +147,15 @@ $(eval $(call SetupJavaCompilation,BUILD_INTERIM_JIMAGE, \ EXCLUDES := jdk/internal/jimage/concurrent, \ BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_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 := $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes, \ + FILES := META-INF/services/java.nio.file.spi.FileSystemProvider)) + ########################################################################################## # Tools needed on solaris because OBJCOPY is broken. @@ -173,7 +182,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) PROGRAM := fix_empty_sec_hdr_flags)) endif -$(BUILD_TOOLS_JDK): $(BUILD_INTERIM_JIMAGE) +$(BUILD_TOOLS_JDK): $(BUILD_INTERIM_JIMAGE) $(COPY_JIMAGE_SERVICE_PROVIDER) java-tools: $(BUILD_TOOLS_JDK)