make/common/Modules.gmk

*** 135,164 ****
  endif
  
  ################################################################################
  # Module list macros
  
! # Use append so that the custom extension may add to this variable
  
! ALL_TOP_SRC_DIRS += \
      $(HOTSPOT_TOPDIR)/src \
      $(JDK_TOPDIR)/src \
      $(LANGTOOLS_TOPDIR)/src \
-     $(CORBA_TOPDIR)/src \
      $(JAXP_TOPDIR)/src \
      $(JAXWS_TOPDIR)/src \
      $(NASHORN_TOPDIR)/src \
      #
  
  # Find all module-info.java files for the current build target platform and
  # configuration.
  # Param 1 - Module to find for, set to * for finding all
  FindAllModuleInfos = \
      $(wildcard \
!         $(patsubst %,%/$(strip $1)/$(OPENJDK_TARGET_OS)/classes/module-info.java, $(ALL_TOP_SRC_DIRS)) \
!         $(patsubst %,%/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/classes/module-info.java, $(ALL_TOP_SRC_DIRS)) \
!         $(patsubst %,%/$(strip $1)/share/classes/module-info.java, $(ALL_TOP_SRC_DIRS)) \
          $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))
  
  # Extract the module names from the paths of module-info.java files. The
  # position of the module directory differs depending on if this is an imported
  # src dir or not.
--- 135,173 ----
  endif
  
  ################################################################################
  # Module list macros
  
! # Use append so that the custom extension may add to these variables
  
! GENERATED_SRC_DIRS += \
!     $(SUPPORT_OUTPUTDIR)/gensrc \
!     #
! 
! TOP_SRC_DIRS += \
!     $(CORBA_TOPDIR)/src \
      $(HOTSPOT_TOPDIR)/src \
      $(JDK_TOPDIR)/src \
      $(LANGTOOLS_TOPDIR)/src \
      $(JAXP_TOPDIR)/src \
      $(JAXWS_TOPDIR)/src \
      $(NASHORN_TOPDIR)/src \
      #
  
+ SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes
+ ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
+   SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes
+ endif
+ SRC_SUBDIRS += share/classes
+ 
  # Find all module-info.java files for the current build target platform and
  # configuration.
  # Param 1 - Module to find for, set to * for finding all
  FindAllModuleInfos = \
      $(wildcard \
!         $(foreach sub, $(SRC_SUBDIRS), \
!           $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
          $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))
  
  # Extract the module names from the paths of module-info.java files. The
  # position of the module directory differs depending on if this is an imported
  # src dir or not.
*** 175,184 ****
--- 184,206 ----
      $(call GetModuleNameFromModuleInfo, $(MODULE_INFOS))))
  
  FindImportedModules = \
      $(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*)))
  
+ # Find all source dirs for a particular module
+ # $1 - Module to find source dirs for
+ FindModuleSrcDirs = \
+     $(strip $(wildcard \
+         $(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
+         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
+ 
+ # Construct the complete module source path
+ GetModuleSrcPath = \
+     $(call PathList, \
+         $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
+         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))
+ 
  ################################################################################
  # Extract module dependencies from module-info.java files.
  
  MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk