< prev index next >

make/CreateJars.gmk

Print this page
rev 13428 : jfr backport

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.  Oracle designates this

@@ -398,25 +398,20 @@
     SKIP_METAINF := true, \
     CHECK_COMPRESS_JAR := true))
 
 ##########################################################################################
 
-ifndef OPENJDK
-  ifeq ($(ENABLE_JFR), true)
-    $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
+$(eval $(call SetupArchive,BUILD_JFR_JAR, , \
         SRCS := $(JDK_OUTPUTDIR)/classes, \
-        SUFFIXES := .class .jfc .xsd, \
-        INCLUDES := com/oracle/jrockit/jfr \
-            oracle/jrockit/jfr \
-            jdk/jfr, \
+    SUFFIXES := .class .jfc .xsd .xml .dtd, \
+    INCLUDES := jdk/jfr, \
         JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
         SKIP_METAINF := true, \
         MANIFEST := $(MAINMANIFEST), \
         CHECK_COMPRESS_JAR := true))
 
-  endif
-endif
+JARS += $(IMAGES_OUTPUTDIR)/lib/jfr.jar
 
 ##########################################################################################
 
 $(eval $(call SetupArchive,BUILD_JSSE_JAR, , \
     SRCS := $(JDK_OUTPUTDIR)/classes, \
< prev index next >