make/hotspot/test/GtestImage.gmk

*** 35,45 ****
        FILES := $(call SHARED_LIBRARY,jvm) gtestLauncher$(EXE_SUFFIX), \
    )) \
    $(eval TARGETS += $$(COPY_GTEST_$v)) \
  )
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    $(foreach v, $(JVM_VARIANTS), \
      $(eval $(call SetupCopyFiles, COPY_GTEST_MSVCR_$v, \
          DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
          FILES := $(MSVCR_DLL) $(MSVCP_DLL), \
          FLATTEN := true, \
--- 35,45 ----
        FILES := $(call SHARED_LIBRARY,jvm) gtestLauncher$(EXE_SUFFIX), \
    )) \
    $(eval TARGETS += $$(COPY_GTEST_$v)) \
  )
  
! ifeq ($(call isTargetOs, windows), true)
    $(foreach v, $(JVM_VARIANTS), \
      $(eval $(call SetupCopyFiles, COPY_GTEST_MSVCR_$v, \
          DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
          FILES := $(MSVCR_DLL) $(MSVCP_DLL), \
          FLATTEN := true, \
*** 52,62 ****
      )) \
      $(eval TARGETS += $$(COPY_GTEST_PDB_$v)) \
    )
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), solaris)
    $(foreach v, $(JVM_VARIANTS), \
      $(eval $(call SetupCopyFiles, COPY_GTEST_STLPORT_$v, \
          DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
          FILES := $(STLPORT_LIB), \
      )) \
--- 52,62 ----
      )) \
      $(eval TARGETS += $$(COPY_GTEST_PDB_$v)) \
    )
  endif
  
! ifeq ($(call isTargetOs, solaris), true)
    $(foreach v, $(JVM_VARIANTS), \
      $(eval $(call SetupCopyFiles, COPY_GTEST_STLPORT_$v, \
          DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
          FILES := $(STLPORT_LIB), \
      )) \