--- old/make/hotspot/test/GtestImage.gmk	2020-05-20 17:59:02.544970605 -0700
+++ new/make/hotspot/test/GtestImage.gmk	2020-05-20 17:59:02.160963232 -0700
@@ -56,14 +56,4 @@
   )
 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), \
-    )) \
-    $(eval TARGETS += $$(COPY_GTEST_STLPORT_$v)) \
-  )
-endif
-
 all: $(TARGETS)