darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-27 14:20:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

8146660: Resolve merge issue in resulting from sun.misc.VM move to jdk.internal.misc

Browse Source 
Reviewed-by: twisti, erikj, chegar
This commit is contained in:
Alejandro Murillo 2016-01-13 12:45:33 -08:00
parent c47e5914fa
commit d9ae786b3b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/Main.gmk
View File

@ -427,6 +427,10 @@ else
# in javadoc. # in javadoc.
java.desktop-gensrc-jdk: java.base-gensrc java.desktop-gensrc-jdk: java.base-gensrc
# The annotation processing for jdk.vm.ci needs java.base classes from the
# current JDK.
jdk.vm.ci-gensrc-hotspot: java.base-java
# Explicitly add dependencies for special targets # Explicitly add dependencies for special targets
java.base-java: unpack-sec java.base-java: unpack-sec

1
modules.xml
View File

@ -237,6 +237,7 @@
<to>jdk.charsets</to> <to>jdk.charsets</to>
<to>jdk.management.resource</to> <to>jdk.management.resource</to>
<to>jdk.scripting.nashorn</to> <to>jdk.scripting.nashorn</to>
<to>jdk.vm.ci</to>
</export> </export>
<export> <export>
<name>jdk.internal.org.objectweb.asm</name> <name>jdk.internal.org.objectweb.asm</name>