makefiles/CompileJavaClasses.gmk

*** 226,236 ****
      EXFILES+=sun/nio/ch/AbstractPollSelectorImpl.java \
          sun/nio/ch/PollSelectorProvider.java \
          sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
  endif
  
! # Exclude nimbus files from rt.jar
  EXFILES+=javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
                                   javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
                                   javax/swing/plaf/nimbus/ScrollBarPainter.java \
                                   javax/swing/plaf/nimbus/SliderPainter.java \
                                   javax/swing/plaf/nimbus/SpinnerPainter.java \
--- 226,242 ----
      EXFILES+=sun/nio/ch/AbstractPollSelectorImpl.java \
          sun/nio/ch/PollSelectorProvider.java \
          sun/nio/ch/SimpleAsynchronousFileChannelImpl.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
! # pick them up since they aren't generated when the source dirs are 
! # searched and they aren't referenced by any other classes so they won't
! # be picked up by implicit compilation. On a rebuild, they are picked up
! # and compiled. Exclude them here to produce the same rt.jar as the old 
! # build does when building just once.
  EXFILES+=javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
           javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
           javax/swing/plaf/nimbus/ScrollBarPainter.java \
           javax/swing/plaf/nimbus/SliderPainter.java \
           javax/swing/plaf/nimbus/SpinnerPainter.java \