make/Images.gmk

rev 52919 : 8189861: Refactor CacheFind
Reviewed-by: sgehwolf

*** 274,298 ****
  ################################################################################
  # Code coverage data files
  
  ifeq ($(GCOV_ENABLED), true)
  
!   GCOV_FIND_EXPR := -type f -name "*.gcno"
! 
!   $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
!       SRC := $(OUTPUTDIR), \
!       DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
!       FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
! 
!   SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
! 
!   $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
        SRC := $(OUTPUTDIR), \
        DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
!       FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
  
!   SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
  
  endif
  
  ################################################################################
  # Debug symbols
--- 274,291 ----
  ################################################################################
  # Code coverage data files
  
  ifeq ($(GCOV_ENABLED), true)
  
!   $(eval $(call SetupCopyFiles,COPY_GCOV_GCNO, \
        SRC := $(OUTPUTDIR), \
        DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
!       FILES := $(call FindFiles, $(HOTSPOT_OUTPUTDIR) \
!           $(SUPPORT_OUTPUTDIR)/native, *.gcno) \
!   ))
  
!   SYMBOLS_TARGETS += $(COPY_GCOV_GCNO)
  
  endif
  
  ################################################################################
  # Debug symbols
*** 321,334 ****
  else
    DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
    # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
    # dirs.
    ifeq ($(OPENJDK_TARGET_OS), macosx)
!     $(eval $(call FillCacheFind, \
!         $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
      FindDebuginfoFiles = \
!         $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
    endif
  endif
  
  # Param 1 - either JDK or JRE
  SetupCopyDebuginfo = \
--- 314,327 ----
  else
    DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
    # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
    # dirs.
    ifeq ($(OPENJDK_TARGET_OS), macosx)
!     $(call FillFindCache, \
!         $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs)
      FindDebuginfoFiles = \
!         $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1)))
    endif
  endif
  
  # Param 1 - either JDK or JRE
  SetupCopyDebuginfo = \