--- a/common/bin/unshuffle_list.txt Wed Jul 05 20:19:45 2017 +0200
+++ b/common/bin/unshuffle_list.txt Fri Feb 13 11:03:13 2015 +0800
@@ -1303,6 +1303,7 @@
jdk/src/jdk.dev/share/classes/com/sun/jarsigner : jdk/src/share/classes/com/sun/jarsigner
jdk/src/jdk.dev/share/classes/com/sun/tools/hat : jdk/src/share/classes/com/sun/tools/hat
jdk/src/jdk.dev/share/classes/sun/security/tools/jarsigner : jdk/src/share/classes/sun/security/tools/jarsigner
+jdk/src/jdk.dev/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool
jdk/src/jdk.dev/share/classes/sun/tools/jar : jdk/src/share/classes/sun/tools/jar
jdk/src/jdk.dev/share/classes/sun/tools/native2ascii : jdk/src/share/classes/sun/tools/native2ascii
jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
@@ -1443,7 +1444,6 @@
jdk/src/jdk.rmic/share/classes/sun/tools/tree : jdk/src/share/classes/sun/tools/tree
jdk/src/jdk.rmic/share/classes/sun/tools/util : jdk/src/share/classes/sun/tools/util
jdk/src/jdk.runtime/share/classes/com/sun/tracing : jdk/src/share/classes/com/sun/tracing
-jdk/src/jdk.runtime/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool
jdk/src/jdk.runtime/share/classes/sun/tracing : jdk/src/share/classes/sun/tracing
jdk/src/jdk.runtime/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
jdk/src/jdk.runtime/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
--- a/make/Images.gmk Wed Jul 05 20:19:45 2017 +0200
+++ b/make/Images.gmk Fri Feb 13 11:03:13 2015 +0800
@@ -183,7 +183,6 @@
keytool.1 \
orbd.1 \
pack200.1 \
- policytool.1 \
rmid.1 \
rmiregistry.1 \
servertool.1 \
@@ -220,6 +219,7 @@
jstat.1 \
jstatd.1 \
native2ascii.1 \
+ policytool.1 \
rmic.1 \
schemagen.1 \
serialver.1 \
--- a/modules.xml Wed Jul 05 20:19:45 2017 +0200
+++ b/modules.xml Fri Feb 13 11:03:13 2015 +0800
@@ -358,7 +358,7 @@
<to>java.rmi</to>
<to>java.security.jgss</to>
<to>jdk.crypto.pkcs11</to>
- <to>jdk.runtime</to>
+ <to>jdk.dev</to>
<to>jdk.security.auth</to>
</export>
<export>
@@ -391,7 +391,6 @@
<to>jdk.crypto.ucrypto</to>
<to>jdk.deploy.osx</to>
<to>jdk.dev</to>
- <to>jdk.runtime</to>
<to>jdk.security.auth</to>
</export>
<export>
@@ -1576,6 +1575,7 @@
<depend>java.base</depend>
<depend>java.scripting</depend>
<depend>java.xml</depend>
+ <depend>java.desktop</depend>
<depend>jdk.compiler</depend>
<depend>jdk.rmic</depend>
<depend>jdk.xml.bind</depend>
@@ -1710,8 +1710,6 @@
<module>
<name>jdk.runtime</name>
<depend>java.base</depend>
- <depend>java.desktop</depend>
- <depend>java.se</depend>
</module>
<module>
<name>jdk.scripting.nashorn</name>