changeset 6428:d6179d8024a8

8019155: Update makefiles with correct jfr packages Reviewed-by: erikj, mgronlun, dholmes, tbell
author sla
date Wed, 26 Jun 2013 19:15:34 +0200
parents c2522d149ff6
children 70b91714c76e
files make/common/Release.gmk
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Release.gmk	Wed Jun 26 12:47:44 2013 +0400
+++ b/make/common/Release.gmk	Wed Jun 26 19:15:34 2013 +0200
@@ -247,7 +247,7 @@
 	 trim-image-jre trim-image-jdk \
 	 identify-image-jre identify-image-jdk \
 	 process-image-jre process-image-jdk sec-files sec-files-win \
-	jgss-files $(EXTRA_IMAGE_TARGETS) server-jdk-image 
+	jgss-files $(EXTRA_IMAGE_TARGETS) server-jdk-image
 else
 
 images:: sanity-images post-sanity-images  \
@@ -423,7 +423,8 @@
 ifdef BUILD_JFR
 JFR_CLASSES_DIRS= \
 	com/oracle/jrockit/jfr \
-	oracle/jrockit/jfr
+	oracle/jrockit/jfr \
+	jdk/internal/jfr
 endif
 
 # classes that go into jsse.jar
@@ -540,7 +541,7 @@
 $(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE: $(SHARE_JDK_DOC_SRC)/SAMPLES_LICENSE
 	$(process-doc-file)
 
-# JRE files 
+# JRE files
 $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
 	$(process-doc-file)
 ifeq ($(PLATFORM), windows)
@@ -638,6 +639,7 @@
 	$(ECHO) "oracle/jrockit/jfr/parser/" >> $@
 	$(ECHO) "oracle/jrockit/jfr/settings/" >> $@
 	$(ECHO) "oracle/jrockit/jfr/tools/" >> $@
+	$(ECHO) "jdk/internal/jfr/events/" >> $@
 endif
 
 
@@ -931,7 +933,7 @@
 	done
 	$(RM) $(JRE_BIN_LIST)
 
-# Duplicate current j2re-image contents to server-j2re-image 
+# Duplicate current j2re-image contents to server-j2re-image
 # for the server version of jre, before deploy build
 server-jdk-image::
 ifeq ($(PLATFORM), macosx)