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.
8023460: OPENJDK build fails due to missing jfr.jar
authordholmes
Wed, 21 Aug 2013 05:56:46 -0400
changeset 19570 e1c7cdf2f15a
parent 19569 d7ab8baed5e0
child 19571 a5417c41a998
8023460: OPENJDK build fails due to missing jfr.jar Reviewed-by: alanb
jdk/makefiles/Profiles.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/makefiles/Profiles.gmk	Mon Aug 19 13:11:03 2013 +0200
+++ b/jdk/makefiles/Profiles.gmk	Wed Aug 21 05:56:46 2013 -0400
@@ -65,10 +65,6 @@
     $(if $(PROFILE_2_JRE_JAR_FILES), $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(PROFILE_2_JRE_JAR_FILES))) \
     $(PROFILE_1_JARS)
 
-ifneq ($(ENABLE_JFR), true)
-  PROFILE_3_JRE_JAR_FILES :=  $(filter-out jfr.jar, $(PROFILE_3_JRE_JAR_FILES))
-endif
-
 PROFILE_3_JARS := \
     $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(PROFILE_3_JRE_JAR_FILES)) \
     $(PROFILE_2_JARS)
@@ -77,6 +73,10 @@
   FULL_JRE_JAR_FILES := $(filter-out alt-rt.jar, $(FULL_JRE_JAR_FILES))
 endif
 
+ifneq ($(ENABLE_JFR), true)
+  FULL_JRE_JAR_FILES :=  $(filter-out jfr.jar, $(FULL_JRE_JAR_FILES))
+endif
+
 FULL_JRE_JARS := \
     $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(FULL_JRE_JAR_FILES)) \
     $(PROFILE_3_JARS)
jdk-sandbox