From a00f63aa81d4f6ed48797b084cc698518e23772d Mon Sep 17 00:00:00 2001
From: Denghui Dong <denghui.ddh@alibaba-inc.com>
Date: Wed, 15 Jul 2020 19:18:46 +0800
Subject: [PATCH] Revert "Summary: Disable JFR support in windows/mac build"

This reverts commit 24c1c07f06ca41b56fd1f46f46fea51428f669a3.
---
 make/CopyFiles.gmk  | 2 --
 make/CreateJars.gmk | 2 --
 2 files changed, 4 deletions(-)

diff --git a/make/CopyFiles.gmk b/make/CopyFiles.gmk
index be9595f8a..bee8346f6 100644
--- a/make/CopyFiles.gmk
+++ b/make/CopyFiles.gmk
@@ -595,7 +595,6 @@ COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties
 
 ##########################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), linux)
 # copy hotspot trace files
 
 HOTSPOT_TRACE_SRC_DIR := $(TOPDIR)/hotspot/src/share/vm/trace
@@ -624,7 +623,6 @@ COPY_FILES += $(JFR_CONFIGURATION_DIR_DST)/default.jfc \
 $(JFR_CONFIGURATION_DIR_DST)/%.jfc: $(JFR_CONFIGURATION_DIR_SRC)/%.jfc
 	$(call install-file)
 
-endif # linux
 ##########################################################################################
 
 -include $(CUSTOM_MAKE_DIR)/CopyFiles.gmk
diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
index 20476fd6a..7de027eac 100644
--- a/make/CreateJars.gmk
+++ b/make/CreateJars.gmk
@@ -401,7 +401,6 @@ $(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \
 
 ##########################################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), linux)
 $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
     SRCS := $(JDK_OUTPUTDIR)/classes, \
     SUFFIXES := .class .jfc .xsd .xml .dtd, \
@@ -412,7 +411,6 @@ $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
     CHECK_COMPRESS_JAR := true))
 
 JARS += $(IMAGES_OUTPUTDIR)/lib/jfr.jar
-endif # linux
 
 ##########################################################################################
 
-- 
GitLab