make/modules/java.desktop/lib/Awt2dLibraries.gmk

*** 430,439 ****
--- 430,442 ----
    TARGETS += $(BUILD_LIBFREETYPE)
  endif
  
  ###########################################################################
  
+ ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
+   LIBHARFBUZZ_LIBS := $(HARFBUZZ_LIBS)
+ else
  HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
  
  # This is better than adding EXPORT_ALL_SYMBOLS
  ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
    HARFBUZZ_CFLAGS += -DHB_EXTERN=__attribute__\(\(visibility\(\"default\"\)\)\)
*** 506,515 ****
--- 509,520 ----
    $(BUILD_LIBHARFBUZZ): $(BUILD_LIBFREETYPE)
  endif
  
  TARGETS += $(BUILD_LIBHARFBUZZ)
  
+ endif
+ 
  ###########################################################################
  
  LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
      libharfbuzz \
      common/awt \
*** 574,584 ****
      LIBS_macosx := -lawt_lwawt, \
      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
          $(WIN_AWT_LIB), \
  ))
  
! $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) $(BUILD_LIBHARFBUZZ)
  
  ifeq ($(call isTargetOs, macosx), true)
    $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
  endif
  
--- 579,593 ----
      LIBS_macosx := -lawt_lwawt, \
      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
          $(WIN_AWT_LIB), \
  ))
  
! $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
! 
! ifeq ($(USE_EXTERNAL_HARFBUZZ), false)
!   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBHARFBUZZ)
! endif
  
  ifeq ($(call isTargetOs, macosx), true)
    $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
  endif