# HG changeset patch # User dholmes # Date 1377079006 14400 # Node ID e1c7cdf2f15adaf1276587b752ba2f41983164b0 # Parent d7ab8baed5e0397db19ad8c63919ca426d6ff1b8 8023460: OPENJDK build fails due to missing jfr.jar Reviewed-by: alanb diff -r d7ab8baed5e0 -r e1c7cdf2f15a jdk/makefiles/Profiles.gmk --- 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)