make/CreateJars.gmk

rev 13762 : 8223147: JFR Backport
8199712: Flight Recorder
8203346: JFR: Inconsistent signature of jfr_add_string_constant
8195817: JFR.stop should require name of recording
8195818: JFR.start should increase autogenerated name by one
8195819: Remove recording=x from jcmd JFR.check output
8203921: JFR thread sampling is missing fixes from JDK-8194552
8203929: Limit amount of data for JFR.dump
8203664: JFR start failure after AppCDS archive created with JFR StartFlightRecording
8003209: JFR events for network utilization
8207392: [PPC64] Implement JFR profiling
Summary: Backport JFR from JDK11. Initial integration
Reviewed-by: neugens

@@ -209,12 +209,11 @@
     sun/tools/tree \
     sun/tools/util \
     sun/util/cldr/CLDRLocaleDataMetaInfo.class \
     sun/util/resources/cldr \
     $(LOCALEDATA_INCLUDES) \
-    com/oracle/jrockit/jfr \
-    oracle/jrockit/jfr \
+    jdk/management/jfr \
     jdk/jfr
 
 # Find all files in the classes dir to use as dependencies. This could be more fine granular.
 ALL_FILES_IN_CLASSES := $(call not-containing, _the., $(filter-out %javac_state, \
     $(call CacheFind, $(JDK_OUTPUTDIR)/classes)))

@@ -398,24 +397,21 @@
     SKIP_METAINF := true, \
     CHECK_COMPRESS_JAR := true))
 
 ##########################################################################################
 
-ifndef OPENJDK
-  ifeq ($(ENABLE_JFR), true)
-    $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
-        SRCS := $(JDK_OUTPUTDIR)/classes, \
-        SUFFIXES := .class .jfc .xsd, \
-        INCLUDES := com/oracle/jrockit/jfr \
-            oracle/jrockit/jfr \
-            jdk/jfr, \
-        JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
-        SKIP_METAINF := true, \
-        MANIFEST := $(MAINMANIFEST), \
-        CHECK_COMPRESS_JAR := true))
+ifeq ($(ENABLE_JFR), true)
+$(eval $(call SetupArchive,BUILD_JFR_JAR, , \
+SRCS := $(JDK_OUTPUTDIR)/classes $(HOTSPOT_DIST)/jre/lib, \
+SUFFIXES := .class .jfc .xsd .xml, \
+INCLUDES := jdk/management/jfr \
+jdk/jfr, \
+JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
+SKIP_METAINF := true, \
+MANIFEST := $(MAINMANIFEST), \
+CHECK_COMPRESS_JAR := true))
 
-  endif
 endif
 
 ##########################################################################################
 
 $(eval $(call SetupArchive,BUILD_JSSE_JAR, , \