changeset 1900:ce1c42690afb

8146660: Resolve merge issue in resulting from sun.misc.VM move to jdk.internal.misc Reviewed-by: twisti, erikj, chegar
author amurillo
date Wed, 13 Jan 2016 12:45:33 -0800
parents 7847205df7f7
children fd940996c33b 38184b1e208d
files make/Main.gmk modules.xml
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/Main.gmk	Tue Jan 12 11:31:47 2016 -0800
+++ b/make/Main.gmk	Wed Jan 13 12:45:33 2016 -0800
@@ -427,6 +427,10 @@
   # in javadoc.
   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
   java.base-java: unpack-sec
 
--- a/modules.xml	Tue Jan 12 11:31:47 2016 -0800
+++ b/modules.xml	Wed Jan 13 12:45:33 2016 -0800
@@ -237,6 +237,7 @@
       <to>jdk.charsets</to>
       <to>jdk.management.resource</to>
       <to>jdk.scripting.nashorn</to>
+      <to>jdk.vm.ci</to>
     </export>
     <export>
       <name>jdk.internal.org.objectweb.asm</name>