make/common/Modules.gmk

*** 38,47 ****
--- 38,48 ----
  BOOT_MODULES :=
  PLATFORM_MODULES :=
  JRE_TOOL_MODULES :=
  UPGRADEABLE_MODULES :=
  AGGREGATOR_MODULES :=
+ DOCS_MODULES :=
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, , common/Modules.gmk))
  
  BOOT_MODULES += \
*** 56,71 ****
      java.prefs \
      java.rmi \
      java.security.sasl \
      java.xml \
      jdk.httpserver \
      jdk.management \
      jdk.management.agent \
      jdk.net \
      jdk.sctp \
      jdk.unsupported \
-     jdk.internal.vm.ci \
      #
  
  # to be deprivileged
  BOOT_MODULES += \
      jdk.naming.rmi \
--- 57,72 ----
      java.prefs \
      java.rmi \
      java.security.sasl \
      java.xml \
      jdk.httpserver \
+     jdk.internal.vm.ci \
      jdk.management \
      jdk.management.agent \
      jdk.net \
      jdk.sctp \
      jdk.unsupported \
      #
  
  # to be deprivileged
  BOOT_MODULES += \
      jdk.naming.rmi \
*** 94,139 ****
      $(AGGREGATOR_MODULES)
      #
  
  PLATFORM_MODULES += \
      java.compiler \
-     jdk.incubator.httpclient \
      java.scripting \
      java.security.jgss \
      java.smartcardio \
      java.sql \
      java.sql.rowset \
      java.xml.crypto \
      jdk.accessibility \
      jdk.charsets \
-     jdk.crypto.ec \
      jdk.crypto.cryptoki \
      jdk.dynalink \
      jdk.jsobject \
      jdk.localedata \
      jdk.naming.dns \
      jdk.scripting.nashorn \
      jdk.security.auth \
      jdk.security.jgss \
-     jdk.internal.vm.compiler \
      jdk.xml.dom \
      jdk.zipfs \
      #
  
- JRE_TOOL_MODULES += \
-     jdk.jdwp.agent \
-     jdk.pack \
-     jdk.scripting.nashorn.shell \
-     #
- 
  ifeq ($(OPENJDK_TARGET_OS), windows)
    PLATFORM_MODULES += jdk.crypto.mscapi
  endif
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    PLATFORM_MODULES += jdk.crypto.ucrypto
  endif
  
  # These modules are included in the interim image which is used to run profiling
  # before building the real images.
  INTERIM_IMAGE_MODULES := java.base java.logging
  
  ################################################################################
--- 95,178 ----
      $(AGGREGATOR_MODULES)
      #
  
  PLATFORM_MODULES += \
      java.compiler \
      java.scripting \
      java.security.jgss \
      java.smartcardio \
      java.sql \
      java.sql.rowset \
      java.xml.crypto \
      jdk.accessibility \
      jdk.charsets \
      jdk.crypto.cryptoki \
+     jdk.crypto.ec \
      jdk.dynalink \
+     jdk.incubator.httpclient \
+     jdk.internal.vm.compiler \
      jdk.jsobject \
      jdk.localedata \
      jdk.naming.dns \
      jdk.scripting.nashorn \
      jdk.security.auth \
      jdk.security.jgss \
      jdk.xml.dom \
      jdk.zipfs \
      #
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    PLATFORM_MODULES += jdk.crypto.mscapi
  endif
+ 
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    PLATFORM_MODULES += jdk.crypto.ucrypto
  endif
  
+ JRE_TOOL_MODULES += \
+     jdk.jdwp.agent \
+     jdk.pack \
+     jdk.scripting.nashorn.shell \
+     #
+ 
+ ################################################################################
+ 
+ # DOCS_MODULES defines the root modules for javadoc generation.
+ # All of their `require transitive` modules directly and indirectly will be included.
+ DOCS_MODULES += \
+     java.se.ee \
+     java.smartcardio \
+     jdk.accessibility \
+     jdk.attach \
+     jdk.charsets \
+     jdk.compiler \
+     jdk.crypto.cryptoki \
+     jdk.crypto.ec \
+     jdk.dynalink \
+     jdk.editpad \
+     jdk.httpserver \
+     jdk.incubator.httpclient \
+     jdk.jartool \
+     jdk.javadoc \
+     jdk.jconsole \
+     jdk.jdeps \
+     jdk.jdi \
+     jdk.jlink \
+     jdk.jshell \
+     jdk.localedata \
+     jdk.management \
+     jdk.naming.dns \
+     jdk.naming.rmi \
+     jdk.net \
+     jdk.scripting.nashorn \
+     jdk.sctp \
+     jdk.security.auth \
+     jdk.security.jgss \
+     jdk.xml.dom \
+     jdk.zipfs \
+     #
+ 
  # These modules are included in the interim image which is used to run profiling
  # before building the real images.
  INTERIM_IMAGE_MODULES := java.base java.logging
  
  ################################################################################
*** 327,336 ****
--- 366,376 ----
        ifeq ($$(classloader), boot)
          BOOT_MODULES += $1
        else ifeq ($$(classloader), ext)
          PLATFORM_MODULES += $1
        endif
+       DOCS_MODULES += $1
      else
        # Default to include in all
        JRE_MODULES += $1
        JDK_MODULES += $1
      endif