make/common/Modules.gmk

*** 69,102 ****
        $(patsubst %, %/*/$(OPENJDK_TARGET_OS_TYPE), $(ALL_TOP_SRC_DIRS)))))) \
        jdk.hotspot.agent))
  endef
  
  ################################################################################
! 
! $(eval $(call SetupJavaCompilation,BUILD_GENMODULESLIST, \
!     SETUP := BOOT_JAVAC, \
!     SRC := $(JDK_TOPDIR)/make/src/classes, \
!     INCLUDES := build/tools/module, \
!     EXCLUDE_FILES := ImageBuilder.java ModuleArchive.java, \
!     BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist, \
!     DISABLE_SJAVAC := true))
! 
! TOOL_GENMODULESLIST = $(JAVA_SMALL) \
!     -cp "$(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist" \
!     build.tools.module.GenModulesList
! 
! MODULES_LIST_FILE := $(MAKESUPPORT_OUTPUTDIR)/modules.list
  MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk
! 
! $(MODULES_LIST_FILE): $(SRC_ROOT)/modules.xml \
!     $(BUILD_GENMODULESLIST)
!         $(TOOL_GENMODULESLIST) -o $@ $(filter %.xml, $^)
! 
! $(MODULE_DEPS_MAKEFILE): $(MODULES_LIST_FILE)
!         $(CAT) $^ | $(SED) -e 's/^\([^:]*\):/DEPS_\1 :=/g' > $@
! 
! -include $(MODULE_DEPS_MAKEFILE)
  
  # Param 1: Module to find deps for
  define FindDepsForModule
    $(DEPS_$(strip $1))
  endef
--- 69,81 ----
        $(patsubst %, %/*/$(OPENJDK_TARGET_OS_TYPE), $(ALL_TOP_SRC_DIRS)))))) \
        jdk.hotspot.agent))
  endef
  
  ################################################################################
! # The module deps makefile is generated in make/GenerateModuleDeps.gmk
  MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk
! include $(MODULE_DEPS_MAKEFILE)
  
  # Param 1: Module to find deps for
  define FindDepsForModule
    $(DEPS_$(strip $1))
  endef