make/Main.gmk

rev 52445 : imported patch 8213348

*** 685,704 ****
    # The swing beans need to have java base properly generated to avoid errors
    # in javadoc. The X11 wrappers need the java.base include files to have been
    # copied and processed.
    java.desktop-gensrc-src: java.base-gensrc java.base-copy
  
!   # The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
!   # needs classes from the current JDK.
!   jdk.internal.vm.ci-gensrc-src: $(addsuffix -java, \
!       $(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
    jdk.internal.vm.compiler-gensrc-src: $(addsuffix -java, \
        $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
  
!   # For jdk.internal.vm.compiler, the gensrc step is generating a module-info.java.extra
    # file to be processed by the gensrc-moduleinfo target.
    jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
  
    jdk.jdeps-gendata: java rmic
  
    # The ct.sym generation uses all the moduleinfos as input
    jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)
--- 685,705 ----
    # The swing beans need to have java base properly generated to avoid errors
    # in javadoc. The X11 wrappers need the java.base include files to have been
    # copied and processed.
    java.desktop-gensrc-src: java.base-gensrc java.base-copy
  
!   # The annotation processing for jdk.internal.vm.compiler
!   # and jdk.internal.vm.compiler.management needs classes from the current JDK.
    jdk.internal.vm.compiler-gensrc-src: $(addsuffix -java, \
        $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
+   jdk.internal.vm.compiler.management-gensrc-src: $(addsuffix -java, \
+       $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler.management))
  
!   # For these modules, the gensrc step is generating a module-info.java.extra
    # file to be processed by the gensrc-moduleinfo target.
    jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
+   jdk.internal.vm.compiler.management-gensrc-moduleinfo: jdk.internal.vm.compiler.management-gensrc-src
  
    jdk.jdeps-gendata: java rmic
  
    # The ct.sym generation uses all the moduleinfos as input
    jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)