make/CreateJmods.gmk

*** 36,48 ****
  ################################################################################
  
  JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods
  
  LIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
!     $(SUPPORT_OUTPUTDIR)/modules_libs-stripped $(IMPORT_MODULES_LIBS))))
  CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
!     $(SUPPORT_OUTPUTDIR)/modules_cmds-stripped $(IMPORT_MODULES_CMDS))))
  CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
      $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))
  CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))
  
  $(eval $(call FillCacheFind, \
--- 36,48 ----
  ################################################################################
  
  JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods
  
  LIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
!     $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS))))
  CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
!     $(SUPPORT_OUTPUTDIR)/modules_cmds $(IMPORT_MODULES_CMDS))))
  CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
      $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))
  CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))
  
  $(eval $(call FillCacheFind, \
*** 101,111 ****
              --module-version $(VERSION_SHORT) \
              --os-name $(REQUIRED_OS_NAME) \
              --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \
              --os-version $(REQUIRED_OS_VERSION) \
              --module-path $(JMODS_DIR) \
!             --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \
              $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@)
          $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@
  
  TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod
  
--- 101,111 ----
              --module-version $(VERSION_SHORT) \
              --os-name $(REQUIRED_OS_NAME) \
              --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \
              --os-version $(REQUIRED_OS_VERSION) \
              --module-path $(JMODS_DIR) \
!             --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \
              $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@)
          $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@
  
  TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod