makefiles/CreateJars.gmk

rev 7523 : 8019155: Update makefiles with correct jfr packages
Reviewed-by:

*** 244,254 ****
          sun/tools/util \
          sun/util/cldr/CLDRLocaleDataMetaInfo.class \
          sun/util/resources/cldr \
          $(LOCALEDATA_INCLUDES) \
          com/oracle/jrockit/jfr \
!         oracle/jrockit/jfr
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
          RT_JAR_EXCLUDES += com/sun/nio/sctp \
                             sun/nio/ch/sctp
  endif
--- 244,255 ----
          sun/tools/util \
          sun/util/cldr/CLDRLocaleDataMetaInfo.class \
          sun/util/resources/cldr \
          $(LOCALEDATA_INCLUDES) \
          com/oracle/jrockit/jfr \
!         oracle/jrockit/jfr \
!         jdk/jfr
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
          RT_JAR_EXCLUDES += com/sun/nio/sctp \
                             sun/nio/ch/sctp
  endif
*** 426,436 ****
  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,\
                  JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\
                  SKIP_METAINF:=true,\
                  MANIFEST:=$(MAINMANIFEST), \
                  CHECK_COMPRESS_JAR:=true))
  
--- 427,438 ----
  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))