Skip to content

Commit

Permalink
Summary: Disable JFR support in windows/mac build
Browse files Browse the repository at this point in the history
Test Plan: existing test cases

Reviewed-by: shiyue, kuaiwei

Issue: dragonwell-project/dragonwell8#52
  • Loading branch information
D-D-H committed Sep 18, 2019
1 parent a6bb468 commit c724eac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions make/CopyFiles.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 2 additions & 0 deletions make/CreateJars.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand All @@ -410,6 +411,7 @@ $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
CHECK_COMPRESS_JAR := true))

JARS += $(IMAGES_OUTPUTDIR)/lib/jfr.jar
endif # linux

##########################################################################################

Expand Down

0 comments on commit c724eac

Please sign in to comment.