make/lib/Awt2dLibraries.gmk

*** 285,297 ****
      LIBAWT_XAWT_DIRS := \
          $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
!         $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
          $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
          #
  
      ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
        LIBAWT_XAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
--- 285,296 ----
      LIBAWT_XAWT_DIRS := \
          $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
          $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
!         $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
!         $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
          $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
          #
  
      ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
        LIBAWT_XAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
*** 514,541 ****
  # Mac and Windows only use the native AWT lib, do not build libawt_headless
  ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
  
    LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
!       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
!       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
!       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
        #
  
    LIBAWT_HEADLESS_EXCLUDES := medialib
    LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
        $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
-       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
-       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
    LIBAWT_HEADLESS_REORDER :=
--- 513,541 ----
  # Mac and Windows only use the native AWT lib, do not build libawt_headless
  ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
  
    LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
!       $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
!       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
        #
  
    LIBAWT_HEADLESS_EXCLUDES := medialib
    LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
        $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
+       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
+       -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
    LIBAWT_HEADLESS_REORDER :=
*** 950,979 ****
  
    LIBAWT_LWAWT_DIRS := \
        $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
        $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
!       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
        #
  
    LIBAWT_LWAWT_CFLAGS := \
        $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
-       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
-       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
        -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
        -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
-       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
-       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
!       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
    LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
--- 950,980 ----
  
    LIBAWT_LWAWT_DIRS := \
        $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
        $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \
        $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
!       $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
        #
  
    LIBAWT_LWAWT_CFLAGS := \
        $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
        -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
        -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
+       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
+       -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
+       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
        -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
!       -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
        -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
        $(LIBJAVA_HEADER_FLAGS) \
        #
  
    LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c