makefiles/CompileJavaClasses.gmk

rev 8336 : 8025673: [macosx] Disable X11 AWT toolkit
Summary: Disable but not completely remove the XAWT and headless toolkits on Mac OS X
Reviewed-by:
Contributed-by: david.dehaven@oracle.com

*** 94,108 ****
        sun/tools/attach/SolarisVirtualMachine.java
  
    EXCLUDES += com/oracle/security
  endif
  
! # In the old build, this isn't excluded on macosx, even though it probably
! # should be.
! ifneq ($(OPENJDK_TARGET_OS), macosx)
!   EXFILES += WrapperGenerator.java
! endif
  
  ifneq ($(OPENJDK_TARGET_OS), windows)
    # Exclude Window security related files in src/share/classes
    EXFILES += NTLoginModule.java \
        NTSystem.java
--- 94,104 ----
        sun/tools/attach/SolarisVirtualMachine.java
  
    EXCLUDES += com/oracle/security
  endif
  
! EXFILES += WrapperGenerator.java
  
  ifneq ($(OPENJDK_TARGET_OS), windows)
    # Exclude Window security related files in src/share/classes
    EXFILES += NTLoginModule.java \
        NTSystem.java
*** 167,177 ****
  # Used on windows and macosx
  ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
    EXFILES += sun/awt/AWTCharset.java
  endif
  
! ifneq ($(OPENJDK_TARGET_OS), macosx)
    EXFILES += sun/awt/X11/ScreenFormat.java \
        sun/awt/X11/XArc.java \
        sun/awt/X11/XChar2b.java \
        sun/awt/X11/XCharStruct.java \
        sun/awt/X11/XClassHint.java \
--- 163,177 ----
  # Used on windows and macosx
  ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
    EXFILES += sun/awt/AWTCharset.java
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
!   # exclude all X11 on Mac, we can't exclude some like below or we'll have compilation errors
!   EXCLUDES += sun/awt/X11
! else
!   # TBD: figure out how to eliminate this long list
    EXFILES += sun/awt/X11/ScreenFormat.java \
        sun/awt/X11/XArc.java \
        sun/awt/X11/XChar2b.java \
        sun/awt/X11/XCharStruct.java \
        sun/awt/X11/XClassHint.java \