make/gensrc/GensrcIcons.gmk

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -68,10 +68,14 @@
         $(call MakeDir, $(GENSRC_AWT_ICONS_DST))
         $(TOUCH) $@
 
 ################################################################################
 
+TOOL_AWT_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true \
+    -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    org.openjdk.buildtools.icondataawt.ToBin
+
 define SetupGensrcAWTIcon
   # param 1 is for src-file
   # param 2 is for src-dir
   $1_SHORTNAME := $(call GENSRC_AWT_ICONS_SHORT_NAME,$1)
   $1_NAME32 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,32)

@@ -107,10 +111,13 @@
 GENSRC_JAVA_DESKTOP += $(GENSRC_AWT_ICONS)
 
 ################################################################################
 
 ifeq ($(call isTargetOs, macosx), true)
+  TOOL_OSX_TOBIN = $(JAVA_SMALL) -Djava.awt.headless=true \
+      -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+      org.openjdk.buildtools.icondataosx.ToBin
 
   GENSRC_OSX_ICONS_DST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop
   GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
 
   GENSRC_OSX_ICONS_SRC ?= $(TOPDIR)/make/data/macosxicons/JavaApp.icns