make/CompileJavaModules.gmk

*** 51,71 ****
  # 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
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
!   JAVA_BASE_UNIX_DIR := $(JDK_TOPDIR)/src/java.base/unix/classes
!   # TODO: make JavaCompilation handle overrides automatically instead of excluding here
!   # These files are overridden in macosx
!   java.base_EXCLUDE_FILES += \
!       $(JAVA_BASE_UNIX_DIR)/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
!       $(JAVA_BASE_UNIX_DIR)/java/net/DefaultInterface.java \
!       $(JAVA_BASE_UNIX_DIR)/java/lang/ClassLoaderHelper.java \
!       $(JAVA_BASE_UNIX_DIR)/sun/nio/ch/DefaultSelectorProvider.java \
!       #
!   # This is just skipped on macosx
!   java.base_EXCLUDE_FILES += $(JAVA_BASE_UNIX_DIR)/sun/nio/fs/GnomeFileTypeDetector.java
  endif
  
  ifneq ($(OPENJDK_TARGET_OS), solaris)
    java.base_EXCLUDE_FILES += \
        SolarisLoginModule.java \
--- 51,61 ----
  # 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
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
!   java.base_EXCLUDE_FILES += sun/nio/fs/GnomeFileTypeDetector.java
  endif
  
  ifneq ($(OPENJDK_TARGET_OS), solaris)
    java.base_EXCLUDE_FILES += \
        SolarisLoginModule.java \
*** 245,261 ****
      javax/swing/plaf/nimbus/SpinnerPainter.java \
      javax/swing/plaf/nimbus/SplitPanePainter.java \
      javax/swing/plaf/nimbus/TabbedPanePainter.java \
      #
  
- ifeq ($(OPENJDK_TARGET_OS), macosx)
-   # These files are duplicated in MACOSX_SRC_DIRS
-   java.desktop_EXCLUDE_FILES += \
-       $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
-       #
- endif
- 
  ################################################################################
  
  java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
  java.scripting_COPY := .js
  java.scripting_CLEAN := .properties
--- 235,244 ----
*** 416,426 ****
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
  endif
  
  ifeq ($(OPENJDK_TARGET_OS),aix)
-   # These files are duplicated in AIX_SRC_DIRS
    jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
  endif
  
  ################################################################################
  
--- 399,408 ----