Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8038459: Remove superflous classes on platforms without an implementation [macosx, aix]
authorchegar
Thu, 27 Mar 2014 13:42:39 +0000
changeset 23586 bb12b5f40a86
parent 23585 e4412d1b53d3
child 23587 55ccc7b19f84
8038459: Remove superflous classes on platforms without an implementation [macosx, aix] Reviewed-by: erikj
jdk/make/CompileJavaClasses.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/CompileJavaClasses.gmk	Wed Mar 26 23:53:22 2014 +0000
+++ b/jdk/make/CompileJavaClasses.gmk	Thu Mar 27 13:42:39 2014 +0000
@@ -267,6 +267,20 @@
       $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
 endif
 
+# No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
+SCTP_IMPL_CLASSES = \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java\
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/AssociationImpl.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpNet.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpNotification.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SendFailed.java \
+    $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/Shutdown.java
+
 MACOSX_SRC_DIRS :=
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes
@@ -278,9 +292,7 @@
       $(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
       $(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
       $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java \
-      $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
-      $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
-      $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
+  EXFILES += $(SCTP_IMPL_CLASSES)
 
 endif
 
@@ -302,9 +314,7 @@
      AIX_SRC_DIRS += $(JDK_TOPDIR)/src/aix/classes
 
   # these files are duplicated in AIX_SRC_DIRS
-  EXFILES += $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
-      $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
-      $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
+  EXFILES += $(SCTP_IMPL_CLASSES)
 endif
 
 # The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying
jdk-sandbox