make/CompileJavaModules.gmk
changeset 30425 4f2d40e5fb6e
parent 30423 bb60661a9f3c
parent 30095 0034766ccb09
child 30426 3595be2840ac
equal deleted inserted replaced
30424:916dd7a5557e 30425:4f2d40e5fb6e
    51 # Exclude BreakIterator classes that are just used in compile process to generate
    51 # Exclude BreakIterator classes that are just used in compile process to generate
    52 # data files and shouldn't go in the product
    52 # data files and shouldn't go in the product
    53 java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
    53 java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
    54 
    54 
    55 ifeq ($(OPENJDK_TARGET_OS), macosx)
    55 ifeq ($(OPENJDK_TARGET_OS), macosx)
    56   JAVA_BASE_UNIX_DIR := $(JDK_TOPDIR)/src/java.base/unix/classes
    56   java.base_EXCLUDE_FILES += sun/nio/fs/GnomeFileTypeDetector.java
    57   # TODO: make JavaCompilation handle overrides automatically instead of excluding here
       
    58   # These files are overridden in macosx
       
    59   java.base_EXCLUDE_FILES += \
       
    60       $(JAVA_BASE_UNIX_DIR)/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
       
    61       $(JAVA_BASE_UNIX_DIR)/java/net/DefaultInterface.java \
       
    62       $(JAVA_BASE_UNIX_DIR)/java/lang/ClassLoaderHelper.java \
       
    63       $(JAVA_BASE_UNIX_DIR)/sun/nio/ch/DefaultSelectorProvider.java \
       
    64       #
       
    65   # This is just skipped on macosx
       
    66   java.base_EXCLUDE_FILES += $(JAVA_BASE_UNIX_DIR)/sun/nio/fs/GnomeFileTypeDetector.java
       
    67 endif
    57 endif
    68 
    58 
    69 ifneq ($(OPENJDK_TARGET_OS), solaris)
    59 ifneq ($(OPENJDK_TARGET_OS), solaris)
    70   java.base_EXCLUDE_FILES += \
    60   java.base_EXCLUDE_FILES += \
    71       SolarisLoginModule.java \
    61       SolarisLoginModule.java \
   244     javax/swing/plaf/nimbus/SpinnerPainter.java \
   234     javax/swing/plaf/nimbus/SpinnerPainter.java \
   245     javax/swing/plaf/nimbus/SplitPanePainter.java \
   235     javax/swing/plaf/nimbus/SplitPanePainter.java \
   246     javax/swing/plaf/nimbus/TabbedPanePainter.java \
   236     javax/swing/plaf/nimbus/TabbedPanePainter.java \
   247     #
   237     #
   248 
   238 
   249 ifeq ($(OPENJDK_TARGET_OS), macosx)
       
   250   # These files are duplicated in MACOSX_SRC_DIRS
       
   251   java.desktop_EXCLUDE_FILES += \
       
   252       $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
       
   253       #
       
   254 endif
       
   255 
       
   256 ################################################################################
   239 ################################################################################
   257 
   240 
   258 java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
   241 java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
   259 java.scripting_COPY := .js
   242 java.scripting_COPY := .js
   260 java.scripting_CLEAN := .properties
   243 java.scripting_CLEAN := .properties
   415 ifeq ($(OPENJDK_TARGET_OS), macosx)
   398 ifeq ($(OPENJDK_TARGET_OS), macosx)
   416   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
   399   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
   417 endif
   400 endif
   418 
   401 
   419 ifeq ($(OPENJDK_TARGET_OS),aix)
   402 ifeq ($(OPENJDK_TARGET_OS),aix)
   420   # These files are duplicated in AIX_SRC_DIRS
       
   421   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
   403   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
   422 endif
   404 endif
   423 
   405 
   424 ################################################################################
   406 ################################################################################
   425 
   407