Mercurial > hg > icedtea7-forest-aarch64 > jdk
changeset 5192:8a3c4f03855b
Merge
author | nloodin |
---|---|
date | Wed, 28 Mar 2012 09:12:00 -0400 |
parents | 5c703dacb076 (current diff) e80c166c37b0 (diff) |
children | 1dff65eca846 |
files | |
diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Release.gmk Wed Mar 28 17:04:01 2012 +0400 +++ b/make/common/Release.gmk Wed Mar 28 09:12:00 2012 -0400 @@ -616,10 +616,6 @@ $(ECHO) "oracle/jrockit/jfr/parser/" >> $@ $(ECHO) "oracle/jrockit/jfr/settings/" >> $@ $(ECHO) "oracle/jrockit/jfr/tools/" >> $@ - $(ECHO) "oracle/jrockit/jfr/util/" >> $@ - $(ECHO) "oracle/jrockit/jfr/util/log/" >> $@ - $(ECHO) "oracle/jrockit/jfr/util/os/" >> $@ - $(ECHO) "oracle/jrockit/jfr/util/text/" >> $@ endif endif @@ -646,7 +642,7 @@ $(MV) $@.temp $@ @($(CD) $(CLASSBINDIR) && $(java-vm-cleanup)) -# Create the jfr.jar containing Java Flight Recorder implementation +# Create jfr.jar JFR_JAR= ifndef OPENJDK ifndef JAVASE_EMBEDDED