Merge
authorprr
Thu, 27 Oct 2016 08:52:00 -0700
changeset 41655 dcbae5d16e02
parent 41654 e560407b43cf (diff)
parent 41652 a0664e2b49a1 (current diff)
child 41656 fd9df30e8738
Merge
jdk/src/java.base/share/classes/jdk/internal/misc/JavaNetAccess.java
jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/Jlink.java
jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/JlinkPermission.java
jdk/test/sun/net/www/protocol/https/HttpsClient/OriginServer.java
jdk/test/sun/reflect/ReflectionFactory/NewConstructorForSerialization.java
jdk/test/sun/security/tools/jarsigner/ts.sh
langtools/test/tools/javac/T8029102/WarnSerializableLambdaTest.java
langtools/test/tools/javac/T8029102/WarnSerializableLambdaTest.out
--- a/make/common/Modules.gmk	Wed Oct 26 16:00:26 2016 +0200
+++ b/make/common/Modules.gmk	Thu Oct 27 08:52:00 2016 -0700
@@ -108,6 +108,7 @@
     jdk.charsets \
     jdk.crypto.ec \
     jdk.crypto.pkcs11 \
+    jdk.desktop \
     jdk.dynalink \
     jdk.jsobject \
     jdk.localedata \