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
authorjiangli
Mon, 23 Nov 2015 14:41:54 -0500
changeset 34115 00b704eed6b5
parent 34114 43ac874b754c (current diff)
parent 33725 94da318cb5d7 (diff)
child 34116 b746e382da18
Merge
modules.xml file | annotate | diff | comparison | revisions 
--- a/make/CompileJavaModules.gmk	Thu Nov 19 19:30:47 2015 -0500
+++ b/make/CompileJavaModules.gmk	Mon Nov 23 14:41:54 2015 -0500
@@ -369,7 +369,7 @@
 
 ################################################################################
 
-jdk.javadoc_COPY := .xml .css .js
+jdk.javadoc_COPY := .xml .css .js .png
 
 ################################################################################
 
--- a/make/Main.gmk	Thu Nov 19 19:30:47 2015 -0500
+++ b/make/Main.gmk	Mon Nov 23 14:41:54 2015 -0500
@@ -482,6 +482,8 @@
 
   test-hotspot-jtreg: jimages test-image
 
+  install: product-images
+
 endif
 
 ################################################################################
--- a/modules.xml	Thu Nov 19 19:30:47 2015 -0500
+++ b/modules.xml	Mon Nov 23 14:41:54 2015 -0500
@@ -460,6 +460,10 @@
       <to>jdk.localedata</to>
     </export>
     <export>
+      <name>jdk.internal.logger</name>
+      <to>java.logging</to>
+    </export>
+    <export>
       <name>sun.util.logging</name>
       <to>java.desktop</to>
       <to>java.logging</to>
@@ -1708,6 +1712,9 @@
     <export>
       <name>com.sun.jarsigner</name>
     </export>
+    <export>
+      <name>jdk.security.jarsigner</name>
+    </export>
   </module>
   <module>
     <name>jdk.javadoc</name>
jdk-sandbox