From c724eac3746c955417dad3496496702afdf80762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=93=E6=98=82?= <denghui.ddh@alibaba-inc.com>
Date: Mon, 16 Sep 2019 20:14:18 +0800
Subject: [PATCH] Summary: Disable JFR support in windows/mac build

Test Plan: existing test cases

Reviewed-by: shiyue, kuaiwei

Issue: https://github.com/alibaba/dragonwell8/issues/52
---
 make/CopyFiles.gmk  | 2 ++
 make/CreateJars.gmk | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/make/CopyFiles.gmk b/make/CopyFiles.gmk
index 3e40863c7..cb9f98f86 100644
--- a/make/CopyFiles.gmk
+++ b/make/CopyFiles.gmk
@@ -594,6 +594,7 @@ 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
@@ -622,6 +623,7 @@ 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 f949dfad0..5ae807f5c 100644
--- a/make/CreateJars.gmk
+++ b/make/CreateJars.gmk
@@ -400,6 +400,7 @@ $(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, \
@@ -410,6 +411,7 @@ $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
     CHECK_COMPRESS_JAR := true))
 
 JARS += $(IMAGES_OUTPUTDIR)/lib/jfr.jar
+endif # linux
 
 ##########################################################################################
 
-- 
GitLab