From f988dba45540d49d3853b063628c133804ba798f Mon Sep 17 00:00:00 2001
From: neugens <unknown>
Date: Thu, 13 Feb 2020 15:18:14 +0100
Subject: [PATCH] 8238589: Necessary code cleanup in JFR for JDK8u Reviewed-by:
 shade, apetushkov

---
 make/CopyIntoClasses.gmk |  8 --------
 make/CreateJars.gmk      | 18 +++++++++---------
 test/TEST.groups         |  1 -
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/make/CopyIntoClasses.gmk b/make/CopyIntoClasses.gmk
index 9ae98c4cd..ec27f577d 100644
--- a/make/CopyIntoClasses.gmk
+++ b/make/CopyIntoClasses.gmk
@@ -91,14 +91,6 @@ ifndef OPENJDK
       $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
 endif
 
-ifeq ($(ENABLE_JFR), true)
-#  JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
-#  COPY_FILES += \
-#      $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
-#  COPY_FILES += \
-#      $(HOTSPOT_DIST)/jre/lib/metadata.xml
-endif
-
 SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic
 COPY_FILES += \
     $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png)
diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
index 7140bc302..6e4843690 100644
--- a/make/CreateJars.gmk
+++ b/make/CreateJars.gmk
@@ -400,15 +400,15 @@ $(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \
 ##########################################################################################
 
 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))
+  $(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
 
diff --git a/test/TEST.groups b/test/TEST.groups
index 5b60d00b2..0e899de1f 100644
--- a/test/TEST.groups
+++ b/test/TEST.groups
@@ -63,7 +63,6 @@ jdk_lang = \
 jdk_jfr = \
     jdk/jfr
 
-
 # All of the java.util package
 jdk_util = \
     :jdk_util_other \
-- 
GitLab