jdk/make/lib/Awt2dLibraries.gmk

*** 21,30 ****
--- 21,32 ----
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
+ $(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries-pre.gmk))
+ 
  WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
  
  ################################################################################
  
  BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
*** 210,224 ****
    LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
    ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
      LIBAWT_CFLAGS += -DMLIB_OS64BIT
    endif
  
!   ifdef OPENJDK
!     LIBAWT_RC_FLAGS := -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons
!   else
!     LIBAWT_RC_FLAGS := -I $(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons
!   endif
    LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
  endif
  
  LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers
  ifeq ($(OPENJDK_TARGET_OS), linux)
--- 212,222 ----
    LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
    ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
      LIBAWT_CFLAGS += -DMLIB_OS64BIT
    endif
  
!   LIBAWT_RC_FLAGS ?= -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons
    LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
  endif
  
  LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers
  ifeq ($(OPENJDK_TARGET_OS), linux)
*** 452,468 ****
  
  $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
  
  ################################################################################
  
- ifdef OPENJDK
-   BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
- else
-   BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers-closed
-   LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libjavajpeg
- endif
- 
  LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
  
  BUILD_LIBJAVAJPEG_REORDER :=
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
--- 450,459 ----
*** 508,518 ****
          $(LIBJAVA_HEADER_FLAGS) \
          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
      DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \
      DISABLED_WARNINGS_clang := logical-op-parentheses, \
      DISABLED_WARNINGS_microsoft := 4267, \
!     MAPFILE := $(BUILD_LIBJAVAJPEG_MAPFILE), \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
      LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
--- 499,509 ----
          $(LIBJAVA_HEADER_FLAGS) \
          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
      DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds, \
      DISABLED_WARNINGS_clang := logical-op-parentheses, \
      DISABLED_WARNINGS_microsoft := 4267, \
!     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
      LIBS_windows := $(WIN_JAVA_LIB) jvm.lib, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
*** 643,661 ****
  
  LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
  
  #### End harfbuzz configuration
  
! ifndef OPENJDK
!   LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k
!   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
!   LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
! else
!   LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS)
!   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers.openjdk
!   BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
! endif
  
  LIBFONTMANAGER_OPTIMIZATION := HIGH
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
--- 634,647 ----
  
  LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
  
  #### End harfbuzz configuration
  
! LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS)
! # This may be overridden in a custom makefile
! BUILD_LIBFONTMANAGER_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
! BUILD_LIBFONTMANAGER_FONTLIB += $(FREETYPE_LIBS)
  
  LIBFONTMANAGER_OPTIMIZATION := HIGH
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \