equal
deleted
inserted
replaced
38 BUILD_TOOLS_JDK := $(call SetupJavaCompilationCompileTarget, \ |
38 BUILD_TOOLS_JDK := $(call SetupJavaCompilationCompileTarget, \ |
39 BUILD_TOOLS_JDK, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes) |
39 BUILD_TOOLS_JDK, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes) |
40 |
40 |
41 ################################################################################ |
41 ################################################################################ |
42 |
42 |
43 ifeq ($(BOOT_JDK_MODULAR), true) |
|
44 COMPILEFONTCONFIG_ADD_EXPORTS := --add-exports java.desktop/sun.awt=ALL-UNNAMED |
|
45 endif |
|
46 |
|
47 TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
43 TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
48 $(COMPILEFONTCONFIG_ADD_EXPORTS) \ |
44 --add-exports java.desktop/sun.awt=ALL-UNNAMED \ |
49 build.tools.compilefontconfig.CompileFontConfig |
45 build.tools.compilefontconfig.CompileFontConfig |
50 |
46 |
51 TOOL_COMPILEPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
47 TOOL_COMPILEPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
52 build.tools.compileproperties.CompileProperties |
48 build.tools.compileproperties.CompileProperties |
53 |
49 |
93 build.tools.charsetmapping.Main $(LOG_INFO) |
89 build.tools.charsetmapping.Main $(LOG_INFO) |
94 |
90 |
95 TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp |
91 TOOL_SPP = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.spp.Spp |
96 |
92 |
97 # Nimbus is used somewhere in the swing build. |
93 # Nimbus is used somewhere in the swing build. |
98 |
|
99 ifeq ($(BOOT_JDK_MODULAR), true) |
|
100 COMPILENIMBUS_ADD_MODS := --add-modules java.xml.bind |
|
101 endif |
|
102 |
|
103 TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
94 TOOL_GENERATENIMBUS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
104 $(COMPILENIMBUS_ADD_MODS) \ |
95 --add-modules java.xml.bind \ |
105 build.tools.generatenimbus.Generator |
96 build.tools.generatenimbus.Generator |
106 |
97 |
107 TOOL_WRAPPERGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
98 TOOL_WRAPPERGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
108 build.tools.x11wrappergen.WrapperGenerator |
99 build.tools.x11wrappergen.WrapperGenerator |
109 |
100 |