@@ -30,7 +30,6 @@ include $(SPEC)
30
30
include MakeBase.gmk
31
31
include Modules.gmk
32
32
include JavaCompilation.gmk
33
- include SetupJavaCompilers.gmk
34
33
35
34
# Hook to include the corresponding custom file, if present.
36
35
$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
@@ -40,7 +39,7 @@ $(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
40
39
41
40
java.base_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
42
41
'-Xdoclint/package:java.*,javax.*'
43
- java.base_ADD_JAVAC_FLAGS += -XDstringConcat=inline
42
+ java.base_JAVAC_FLAGS += -XDstringConcat=inline
44
43
java.base_COPY += .icu .dat .spp .nrm content-types.properties \
45
44
hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
46
45
java.base_CLEAN += intrinsic.properties
@@ -86,7 +85,6 @@ java.datatransfer_COPY += flavormap.properties
86
85
87
86
java.desktop_DOCLINT += -Xdoclint:all/protected,-reference \
88
87
'-Xdoclint/package:java.*,javax.*'
89
- java.desktop_ADD_JAVAC_FLAGS += --doclint-format html4
90
88
java.desktop_COPY += .gif .png .wav .txt .xml .css .pf
91
89
java.desktop_CLEAN += iio-plugin.properties cursors.properties
92
90
@@ -315,7 +313,7 @@ jdk.charsets_COPY += .dat
315
313
316
314
jdk.compiler_DOCLINT += -Xdoclint:all/protected \
317
315
'-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*'
318
- jdk.compiler_ADD_JAVAC_FLAGS += -XDstringConcat=inline
316
+ jdk.compiler_JAVAC_FLAGS += -XDstringConcat=inline
319
317
jdk.compiler_CLEAN_FILES += $(wildcard \
320
318
$(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
321
319
sun/tools/serialver/resources))
@@ -356,7 +354,7 @@ jdk.javadoc_COPY += .xml .css .js .png
356
354
357
355
################################################################################
358
356
359
- jdk.jartool_ADD_JAVAC_FLAGS += -XDstringConcat=inline
357
+ jdk.jartool_JAVAC_FLAGS += -XDstringConcat=inline
360
358
361
359
################################################################################
362
360
@@ -436,11 +434,11 @@ jdk.internal.jvmstat_COPY += aliasmap
436
434
# The exports are needed since JVMCI is dynamically exported (see
437
435
# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
438
436
439
- jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline
437
+ jdk.internal.vm.ci_JAVAC_FLAGS += -parameters -XDstringConcat=inline
440
438
441
439
################################################################################
442
440
443
- jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
441
+ jdk.internal.vm.compiler_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
444
442
--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \
445
443
--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \
446
444
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \
@@ -509,7 +507,7 @@ jdk.internal.vm.compiler_EXCLUDES += \
509
507
# The exports are needed since JVMCI is dynamically exported (see
510
508
# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).
511
509
512
- jdk.aot_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
510
+ jdk.aot_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
513
511
--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \
514
512
--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \
515
513
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \
@@ -544,7 +542,7 @@ jdk.localedata_KEEP_ALL_TRANSLATIONS := true
544
542
545
543
jdk.jfr_DISABLED_WARNINGS += exports
546
544
jdk.jfr_COPY := .xsd .xml .dtd
547
- jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline
545
+ jdk.jfr_JAVAC_FLAGS := -XDstringConcat=inline
548
546
549
547
################################################################################
550
548
# If this is an imported module that has prebuilt classes, only compile
@@ -607,16 +605,17 @@ ifeq ($(MODULE), jdk.aot)
607
605
endif
608
606
609
607
$(eval $(call SetupJavaCompilation, $(MODULE), \
610
- SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE) , \
608
+ SMALL_JAVA := false , \
611
609
MODULE := $(MODULE), \
612
610
SRC := $(wildcard $(MODULE_SRC_DIRS)), \
613
611
INCLUDES := $(JDK_USER_DEFINED_FILTER), \
614
612
FAIL_NO_SRC := $(FAIL_NO_SRC), \
615
613
BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
616
614
HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
617
615
CREATE_API_DIGEST := true, \
618
- ADD_JAVAC_FLAGS := \
619
- $($(MODULE)_ADD_JAVAC_FLAGS) \
616
+ JAVAC_FLAGS := \
617
+ $($(MODULE)_DOCLINT) \
618
+ $($(MODULE)_JAVAC_FLAGS) \
620
619
--module-source-path $(MODULESOURCEPATH) \
621
620
--module-path $(MODULEPATH) \
622
621
--system none, \
0 commit comments