From b10dace9b45accd0df6e731a0c4a2e94c395fd5e Mon Sep 17 00:00:00 2001 From: Rob McKenna Date: Mon, 30 Nov 2015 17:37:17 +0000 Subject: [PATCH] 8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9 Reviewed-by: alanb, simonis --- make/CompileJavaModules.gmk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index 630ce1b2b10..9167a131dc3 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -56,6 +56,14 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) java.base_EXCLUDE_FILES += sun/nio/fs/GnomeFileTypeDetector.java endif +ifneq ($(filter solaris macosx linux windows,$(OPENJDK_TARGET_OS)), ) + java.base_EXCLUDE_FILES += \ + sun/nio/ch/AbstractPollSelectorImpl.java \ + sun/nio/ch/PollSelectorImpl.java \ + sun/nio/ch/PollSelectorProvider.java \ + # +endif + ifneq ($(OPENJDK_TARGET_OS), solaris) java.base_EXCLUDE_FILES += \ SolarisLoginModule.java \ @@ -72,8 +80,6 @@ endif ifeq ($(OPENJDK_TARGET_OS), windows) java.base_EXCLUDE_FILES += \ - sun/nio/ch/AbstractPollSelectorImpl.java \ - sun/nio/ch/PollSelectorProvider.java \ sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ # endif