--- a/jdk/make/lib/Awt2dLibraries.gmk Wed Feb 12 10:51:50 2014 -0800
+++ b/jdk/make/lib/Awt2dLibraries.gmk Thu Feb 13 00:01:07 2014 +0100
@@ -23,6 +23,9 @@
# questions.
#
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))
+
# Openwin is defined on Solaris.
OPENWIN_LIB := $(OPENWIN_HOME)/lib
@@ -550,10 +553,6 @@
endif
ifeq ($(OPENJDK_TARGET_OS), linux)
- ifndef OPENJDK
- include $(JDK_TOPDIR)/make/closed/xawt.gmk
- endif
-
ifeq ($(DISABLE_XRENDER), true)
LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
endif