langtools/make/CompileInterim.gmk

*** 45,55 ****
        DISABLE_SJAVAC := true, \
        SRC := $(LANGTOOLS_TOPDIR)/src/$(strip $1)/share/classes \
            $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \
        EXCLUDES := sun com/sun/tools/jdeps com/sun/tools/javap \
            com/sun/tools/jdeprscan, \
!       EXCLUDE_FILES := module-info.java JavacToolProvider.java JavadocToolProvider.java, \
        COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \
        BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/$(strip $1), \
        ADD_JAVAC_FLAGS := -Xbootclasspath/p:$$(call PathList, \
            $$(foreach m, $2, $(BUILDTOOLS_OUTPUTDIR)/override_modules/$$m)), \
    ))
--- 45,56 ----
        DISABLE_SJAVAC := true, \
        SRC := $(LANGTOOLS_TOPDIR)/src/$(strip $1)/share/classes \
            $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \
        EXCLUDES := sun com/sun/tools/jdeps com/sun/tools/javap \
            com/sun/tools/jdeprscan, \
!       EXCLUDE_FILES := module-info.java JavacToolProvider.java \
!           JavadocToolProvider.java Standard.java, \
        COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \
        BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/$(strip $1), \
        ADD_JAVAC_FLAGS := -Xbootclasspath/p:$$(call PathList, \
            $$(foreach m, $2, $(BUILDTOOLS_OUTPUTDIR)/override_modules/$$m)), \
    ))