8073021: add native code coverage target into makefiles
Reviewed-by: ihse, tbell, iignatyev
diff --git a/make/Images.gmk b/make/Images.gmk
index 9ee57d3..6fe4f76 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -488,6 +488,42 @@
JDK_TARGETS += $(COPY_JRTFS_JAR)
################################################################################
+# Code coverage data files
+
+ifeq ($(GCOV_ENABLED), true)
+
+ GCOV_FIND_EXPR := -type f -name "*.gcno"
+
+ ifeq ($(JVM_VARIANT_CLIENT), true)
+ $(eval $(call SetupCopyFiles,COPY_HOTSPOT_CLIENT_GCOV_GCNO, \
+ SRC := $(HOTSPOT_OUTPUTDIR), \
+ DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/client, \
+ FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler1/ $(GCOV_FIND_EXPR)), \
+ FLATTEN := true))
+
+ SYMBOLS_TARGETS += $(COPY_HOTSPOT_CLIENT_GCOV_GCNO)
+ endif
+
+ ifeq ($(JVM_VARIANT_SERVER), true)
+ $(eval $(call SetupCopyFiles,COPY_HOTSPOT_SERVER_GCOV_GCNO, \
+ SRC := $(HOTSPOT_OUTPUTDIR), \
+ DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/server, \
+ FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler2/ $(GCOV_FIND_EXPR)), \
+ FLATTEN := true))
+
+ SYMBOLS_TARGETS += $(COPY_HOTSPOT_SERVER_GCOV_GCNO)
+ endif
+
+ $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
+ SRC := $(SUPPORT_OUTPUTDIR)/native, \
+ DEST := $(SYMBOLS_IMAGE_DIR)/gcov/jdk, \
+ FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
+
+ SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
+
+endif
+
+################################################################################
# Include custom post hook here to make it possible to augment the target lists
# before actual target prerequisites are declared.
@@ -498,7 +534,8 @@
$(JRE_TARGETS): $(TOOL_JRE_TARGETS)
$(JDK_TARGETS): $(TOOL_JDK_TARGETS)
-jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS)
+jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) \
+ $(SYMBOLS_TARGETS)
$(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS)