8141338: Move jdk.internal.dynalink package to jdk.dynalink
Reviewed-by: alanb, mchung, sundar
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index ccba0bc..c3f6366 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -369,6 +369,10 @@
################################################################################
+jdk.dynalink_CLEAN := .properties
+
+################################################################################
+
jdk.javadoc_COPY := .xml .css .js .png
################################################################################
diff --git a/make/Images.gmk b/make/Images.gmk
index 7653421..b579734 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -39,12 +39,13 @@
MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
- jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell \
+ jdk.accessibility jdk.internal.le jdk.dynalink \
+ jdk.scripting.nashorn jdk.scripting.nashorn.shell \
jdk.vm.ci jdk.management
# providers
PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
- jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
+ jdk.naming.dns jdk.naming.rmi jdk.zipfs
# tools
TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \
diff --git a/modules.xml b/modules.xml
index dcead5b..68a9de2 100644
--- a/modules.xml
+++ b/modules.xml
@@ -342,6 +342,7 @@
<to>java.logging</to>
<to>java.sql</to>
<to>java.sql.rowset</to>
+ <to>jdk.dynalink</to>
<to>jdk.scripting.nashorn</to>
</export>
<export>
@@ -1657,6 +1658,26 @@
<depend>java.base</depend>
</module>
<module>
+ <name>jdk.dynalink</name>
+ <depend>java.base</depend>
+ <depend>java.logging</depend>
+ <export>
+ <name>jdk.dynalink</name>
+ </export>
+ <export>
+ <name>jdk.dynalink.beans</name>
+ </export>
+ <export>
+ <name>jdk.dynalink.linker</name>
+ </export>
+ <export>
+ <name>jdk.dynalink.linker.support</name>
+ </export>
+ <export>
+ <name>jdk.dynalink.support</name>
+ </export>
+ </module>
+ <module>
<name>jdk.hotspot.agent</name>
<depend>java.base</depend>
<depend>java.datatransfer</depend>
@@ -1849,6 +1870,7 @@
<name>jdk.scripting.nashorn</name>
<depend>java.base</depend>
<depend>java.logging</depend>
+ <depend>jdk.dynalink</depend>
<depend re-exports="true">java.scripting</depend>
<export>
<name>jdk.nashorn.internal.runtime</name>
