< prev index next >

make/CreateJars.gmk

Print this page

        

@@ -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, , \
< prev index next >