make/CompileJavaModules.gmk

*** 49,73 ****
  
  # Exclude BreakIterator classes that are just used in compile process to generate
  # data files and shouldn't go in the product
  java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
  
! ifneq ($(OPENJDK_TARGET_OS), solaris)
    java.base_EXCLUDE_FILES += \
        SolarisLoginModule.java \
        SolarisSystem.java \
        #
  endif
  
! ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), )
!   #
!   # only solaris, macosx and aix
!   #
    java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    java.base_EXCLUDE_FILES += \
        sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
        #
  endif
  
--- 49,70 ----
  
  # Exclude BreakIterator classes that are just used in compile process to generate
  # data files and shouldn't go in the product
  java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
  
! ifneq ($(call isTargetOs, solaris), true)
    java.base_EXCLUDE_FILES += \
        SolarisLoginModule.java \
        SolarisSystem.java \
        #
  endif
  
! ifneq ($(call isTargetOs, solaris macosx aix), true)
    java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
  endif
  
! ifeq ($(call isTargetOs, windows), true)
    java.base_EXCLUDE_FILES += \
        sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
        #
  endif
  
*** 122,132 ****
      sun/awt/X11/java-icon32.png \
      sun/awt/X11/java-icon48.png \
      .template \
      #
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
    # exclude all X11 on Mac.
    java.desktop_EXCLUDES += \
        sun/awt/X11 \
        sun/java2d/x11 \
        sun/java2d/jules \
--- 119,129 ----
      sun/awt/X11/java-icon32.png \
      sun/awt/X11/java-icon48.png \
      .template \
      #
  
! ifeq ($(call isTargetOs, macosx), true)
    # exclude all X11 on Mac.
    java.desktop_EXCLUDES += \
        sun/awt/X11 \
        sun/java2d/x11 \
        sun/java2d/jules \
*** 184,203 ****
        sun/awt/X11/XdbeSwapInfo.java \
        sun/awt/X11/XmbTextItem.java \
        sun/awt/X11/XwcTextItem.java
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
  endif
  
  ifdef BUILD_HEADLESS_ONLY
    java.desktop_EXCLUDES += sun/applet
  endif
  
! # Used on windows and macosx
! ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
    java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
  endif
  
  # These files do not appear in the build result of the old build. This
  # is because they are generated sources, but the AUTO_JAVA_FILES won't
--- 181,199 ----
        sun/awt/X11/XdbeSwapInfo.java \
        sun/awt/X11/XmbTextItem.java \
        sun/awt/X11/XwcTextItem.java
  endif
  
! ifeq ($(call isTargetOs, windows), true)
    java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk
  endif
  
  ifdef BUILD_HEADLESS_ONLY
    java.desktop_EXCLUDES += sun/applet
  endif
  
! ifneq ($(call isTargetOs, windows macosx), true)
    java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java
  endif
  
  # These files do not appear in the build result of the old build. This
  # is because they are generated sources, but the AUTO_JAVA_FILES won't
*** 372,386 ****
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
    jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
  endif
  
! ifeq ($(OPENJDK_TARGET_OS),aix)
    jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
  endif
  
  ################################################################################
  
--- 368,382 ----
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
      $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
  
! ifeq ($(call isTargetOs, macosx), true)
    jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
  endif
  
! ifeq ($(call isTargetOs, aix), true)
    jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
  endif
  
  ################################################################################