Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8075277: JDK is still building X11 related Java files on OSX
authorprr
Tue, 17 Mar 2015 12:14:58 -0700
changeset 29671 2f05f44dfe01
parent 29669 d3148063d225
child 29672 3449f2420896
8075277: JDK is still building X11 related Java files on OSX Reviewed-by: ihse, erikj, serb
make/CompileJavaModules.gmk file | annotate | diff | comparison | revisions 
--- a/make/CompileJavaModules.gmk	Mon Mar 16 17:59:09 2015 +0100
+++ b/make/CompileJavaModules.gmk	Tue Mar 17 12:14:58 2015 -0700
@@ -144,9 +144,19 @@
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   # exclude all X11 on Mac.
-  java.desktop_EXCLUDES += sun/awt/X11
+  java.desktop_EXCLUDES += \
+      sun/awt/X11 \
+      sun/java2d/x11 \
+      sun/java2d/jules \
+      sun/java2d/xr \
+      com/sun/java/swing/plaf/gtk \
+      #
   java.desktop_EXCLUDE_FILES += \
-      $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/BackBufferCapsProvider.java \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/motif/*.java) \
+      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
       #
 else
   # TBD: figure out how to eliminate this long list
jdk-sandbox