make/CompileJavaModules.gmk

*** 465,479 ****
--- 465,489 ----
  # JDK_FILTER at the make command line, only a subset of the JDK java files will
  # be recompiled. If multiple paths are separated by comma, convert that into a
  # space separated list.
  JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
  
+ # Create an empty directory to set the bootclasspath to.
+ EMPTY_BOOTCLASSPATH := $(SUPPORT_OUTPUTDIR)/empty-dir
+ $(call MakeDir, $(EMPTY_BOOTCLASSPATH))
+ 
  # This macro sets up compilation of a module and declares dependencies for it.
  # Param 1 - module name
  define SetupModuleCompilation
    # Find the module dependencies by parsing modules.list file
+   ifeq ($(ENABLE_SJAVAC), yes)
+     # Due to an issue with sjavac, need to include transitive dependencies in
+     # the classpath.
+     $1_DEPS := $$(call FindTransitiveDepsForModule, $1)
+   else
      $1_DEPS := $$(call FindDepsForModule, $1)
+   endif
  
    $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS))
    # When crypto classes are prebuilt, need to look for classes already in
    # output dir.
    ifneq ($(BUILD_CRYPTO), true)
*** 483,493 ****
      ## The source of this module is compiled elsewhere, hotspot, and imported.
      ## Service types are required in the classpath when compiing module-info
      $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent)
    endif
    $1_CLASSPATH := $$(subst $$(SPACE),$$(PATH_SEP),$$($1_CLASSPATH))
!   $1_JAVAC_FLAGS := -bootclasspath "$$($1_CLASSPATH)"
  
    $$(eval $$(call SetupJavaCompilation,$1, \
        SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
        SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
        INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
--- 493,503 ----
      ## The source of this module is compiled elsewhere, hotspot, and imported.
      ## Service types are required in the classpath when compiing module-info
      $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent)
    endif
    $1_CLASSPATH := $$(subst $$(SPACE),$$(PATH_SEP),$$($1_CLASSPATH))
!   $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_BOOTCLASSPATH) -classpath "$$($1_CLASSPATH)"
  
    $$(eval $$(call SetupJavaCompilation,$1, \
        SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
        SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
        INCLUDES:=$(JDK_USER_DEFINED_FILTER),\