changeset 1934:4d65eba233a8 jdk-9+107

Merge
author lana
date Thu, 18 Feb 2016 13:40:42 -0800
parents 53083cbf291b 9f9fe6bb2568
children dbd93bfcf008 623e45a43ff3 d5d0272959aa
files
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Javadoc.gmk	Thu Feb 18 11:30:08 2016 -0800
+++ b/make/Javadoc.gmk	Thu Feb 18 13:40:42 2016 -0800
@@ -212,6 +212,11 @@
 JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
 PLATFORM_DOCSDIR = $(DOCSDIR)/platform
 
+# The core api index file is the target for the core api javadocs rule
+# and needs to be defined early so that all other javadoc rules may
+# depend on it.
+COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
+
 # The non-core api javadocs need to be able to access the root of the core
 # api directory, so for jdk/api or jre/api to get to the core api/
 # directory we would use this:
@@ -363,8 +368,7 @@
 # Overview file for core apis
 COREAPI_OVERVIEW = $(JDK_TOPDIR)/src/java.base/share/classes/overview-core.html
 
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
+# The options and packages files
 COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
 COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
 
--- a/modules.xml	Thu Feb 18 11:30:08 2016 -0800
+++ b/modules.xml	Thu Feb 18 13:40:42 2016 -0800
@@ -239,6 +239,7 @@
       <to>java.xml</to>
       <to>jdk.charsets</to>
       <to>jdk.management.resource</to>
+      <to>jdk.net</to>
       <to>jdk.scripting.nashorn</to>
       <to>jdk.vm.ci</to>
     </export>
@@ -320,6 +321,10 @@
       <to>jdk.naming.dns</to>
     </export>
     <export>
+      <name>sun.net.sdp</name>
+      <to>jdk.net</to>
+    </export>
+    <export>
       <name>sun.net.spi.nameservice</name>
       <to>jdk.naming.dns</to>
     </export>
@@ -345,6 +350,7 @@
       <to>jdk.crypto.pkcs11</to>
       <to>jdk.crypto.ucrypto</to>
       <to>jdk.management.resource</to>
+      <to>jdk.net</to>
       <to>jdk.sctp</to>
     </export>
     <export>