Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8019540: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated.
authorerikj
Thu, 17 Oct 2013 16:15:57 +0200
changeset 20892 e8eeec1da3d9
parent 20890 9d7cc1b4291b
child 20893 c4ac5cc249b4
8019540: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated. Reviewed-by: dholmes, sla
jdk/makefiles/CopyIntoClasses.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/makefiles/CopyIntoClasses.gmk	Wed Oct 16 20:24:46 2013 +0200
+++ b/jdk/makefiles/CopyIntoClasses.gmk	Thu Oct 17 16:15:57 2013 +0200
@@ -91,7 +91,7 @@
       $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
 endif
 
-ifndef OPENJDK
+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
jdk-sandbox