make/lib/Awt2dLibraries.gmk

*** 744,754 ****
          -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
          -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/sun/font \
          -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \
          $(LIBJAVA_HEADER_FLAGS) \
          #
-     LIBAWT_HEADLESS_EXFILES := initIDs.c
  
      LIBAWT_HEADLESS_REORDER :=
      ifeq ($(OPENJDK_TARGET_OS), solaris)
        ifneq ($(OPENJDK_TARGET_CPU), x86_64)
          LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
--- 744,753 ----
*** 757,767 ****
  
      $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
          LIBRARY := awt_headless, \
          OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
          SRC := $(LIBAWT_HEADLESS_DIRS), \
-         EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXFILES), \
          EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
          LANG := C, \
          OPTIMIZATION := LOW, \
          CFLAGS := $(CFLAGS_JDKLIB) \
              -DHEADLESS=true \
--- 756,765 ----
*** 928,938 ****
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
!   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c initIDs.c
    LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib
  
    $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
        LIBRARY := awt_lwawt, \
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
--- 926,936 ----
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/debug \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
!   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
    LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/sun/awt/medialib
  
    $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
        LIBRARY := awt_lwawt, \
        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \