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.
Merge
authorjwilhelm
Sat, 05 Mar 2016 10:10:16 +0100
changeset 36291 ea8cd1782bc0
parent 36288 0114407501b7 (current diff)
parent 36290 68b6b8f114b6 (diff)
child 36292 05f660b6deb3
Merge
--- a/common/bin/compare_exceptions.sh.incl	Mon Feb 29 09:02:13 2016 +0100
+++ b/common/bin/compare_exceptions.sh.incl	Sat Mar 05 10:10:16 2016 +0100
@@ -185,7 +185,6 @@
       ./lib/amd64/libjava.so
       ./lib/amd64/libjawt.so
       ./lib/amd64/libjdwp.so
-      ./lib/amd64/libjfr.so
       ./lib/amd64/libjpeg.so
       ./lib/amd64/libjsdt.so
       ./lib/amd64/libjsound.so
@@ -321,7 +320,6 @@
       ./lib/sparcv9/libjava.so
       ./lib/sparcv9/libjawt.so
       ./lib/sparcv9/libjdwp.so
-      ./lib/sparcv9/libjfr.so
       ./lib/sparcv9/libjpeg.so
       ./lib/sparcv9/libjsdt.so
       ./lib/sparcv9/libjsound.so
--- a/make/CompileJavaModules.gmk	Mon Feb 29 09:02:13 2016 +0100
+++ b/make/CompileJavaModules.gmk	Sat Mar 05 10:10:16 2016 +0100
@@ -368,21 +368,7 @@
 ################################################################################
 
 jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides
-jdk.hotspot.agent_COPY := .png sa.js .properties
-
-ifeq ($(MODULE), jdk.hotspot.agent)
-  ### Copy gif files
-  # Special handling to copy gif files in images/toolbarButtonGraphics \
-  #   -> classes/toolbarButtonGraphics.
-  # These can't be handled by COPY to SetupJavaCompilation since they chop off
-  # one directory level.
-  $(eval $(call SetupCopyFiles, COPY_SA_IMAGES, \
-      SRC := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images, \
-      DEST := $(JDK_OUTPUTDIR)/modules/$(MODULE), \
-      FILES := $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent/share/classes/images/*/*/*.gif), \
-  ))
-  jdk.hotspot.agent: $(COPY_SA_IMAGES)
-endif
+jdk.hotspot.agent_COPY := .gif .png sa.js .properties
 
 ################################################################################
 
--- a/modules.xml	Mon Feb 29 09:02:13 2016 +0100
+++ b/modules.xml	Sat Mar 05 10:10:16 2016 +0100
@@ -239,6 +239,7 @@
       <to>java.xml</to>
       <to>jdk.charsets</to>
       <to>jdk.management.resource</to>
+      <to>jdk.jfr</to>
       <to>jdk.net</to>
       <to>jdk.scripting.nashorn</to>
       <to>jdk.vm.ci</to>
@@ -250,6 +251,22 @@
       <to>jdk.jvmstat</to>
     </export>
     <export>
+      <name>jdk.internal.org.xml.sax</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
+      <name>jdk.internal.org.xml.sax.helpers</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
+      <name>jdk.internal.util.xml</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
+      <name>jdk.internal.util.xml.impl</name>
+      <to>jdk.jfr</to>
+    </export>
+    <export>
       <name>jdk.internal.org.objectweb.asm</name>
       <to>java.instrument</to>
       <to>jdk.jfr</to>
@@ -314,6 +331,7 @@
       <to>jdk.vm.ci</to>
       <to>jdk.zipfs</to>
       <to>java.instrument</to>
+      <to>jdk.jfr</to>
     </export>
     <export>
       <name>sun.net</name>
@@ -914,6 +932,7 @@
       <name>sun.management.spi</name>
       <to>jdk.management</to>
       <to>jdk.management.cmm</to>
+      <to>jdk.management.jfr</to>
     </export>
   </module>
   <module>
jdk-sandbox