Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make/common/Modules.gmk
changeset 44725 8747b14eb49c
parent 43925 3c0049f39b20
child 44726 04aa2c065f5c
equal deleted inserted replaced
44724:8efb5c82a573 44725:8747b14eb49c 
    38 BOOT_MODULES :=
 
    38 BOOT_MODULES :=
 
    39 PLATFORM_MODULES :=
 
    39 PLATFORM_MODULES :=
 
    40 JRE_TOOL_MODULES :=
 
    40 JRE_TOOL_MODULES :=
 
    41 UPGRADEABLE_MODULES :=
 
    41 UPGRADEABLE_MODULES :=
 
    42 AGGREGATOR_MODULES :=
 
    42 AGGREGATOR_MODULES :=
 
       
    43 DOCS_MODULES :=
 
    43 
    44 
    44 # Hook to include the corresponding custom file, if present.
 
    45 # Hook to include the corresponding custom file, if present.
 
    45 $(eval $(call IncludeCustomExtension, , common/Modules.gmk))
 
    46 $(eval $(call IncludeCustomExtension, , common/Modules.gmk))
 
    46 
    47 
    47 BOOT_MODULES += \
 
    48 BOOT_MODULES += \
 
    56     java.prefs \
 
    57     java.prefs \
 
    57     java.rmi \
 
    58     java.rmi \
 
    58     java.security.sasl \
 
    59     java.security.sasl \
 
    59     java.xml \
 
    60     java.xml \
 
    60     jdk.httpserver \
 
    61     jdk.httpserver \
 
       
    62     jdk.internal.vm.ci \
 
    61     jdk.management \
 
    63     jdk.management \
 
    62     jdk.management.agent \
 
    64     jdk.management.agent \
 
    63     jdk.net \
 
    65     jdk.net \
 
    64     jdk.sctp \
 
    66     jdk.sctp \
 
    65     jdk.unsupported \
 
    67     jdk.unsupported \
 
    66     jdk.internal.vm.ci \
 
       
    67     #
 
    68     #
 
    68 
    69 
    69 # to be deprivileged
 
    70 # to be deprivileged
 
    70 BOOT_MODULES += \
 
    71 BOOT_MODULES += \
 
    71     jdk.naming.rmi \
 
    72     jdk.naming.rmi \
 
    94     $(AGGREGATOR_MODULES)
 
    95     $(AGGREGATOR_MODULES)
 
    95     #
 
    96     #
 
    96 
    97 
    97 PLATFORM_MODULES += \
 
    98 PLATFORM_MODULES += \
 
    98     java.compiler \
 
    99     java.compiler \
 
    99     jdk.incubator.httpclient \
 
       
   100     java.scripting \
 
   100     java.scripting \
 
   101     java.security.jgss \
 
   101     java.security.jgss \
 
   102     java.smartcardio \
 
   102     java.smartcardio \
 
   103     java.sql \
 
   103     java.sql \
 
   104     java.sql.rowset \
 
   104     java.sql.rowset \
 
   105     java.xml.crypto \
 
   105     java.xml.crypto \
 
   106     jdk.accessibility \
 
   106     jdk.accessibility \
 
   107     jdk.charsets \
 
   107     jdk.charsets \
 
       
   108     jdk.crypto.cryptoki \
 
   108     jdk.crypto.ec \
 
   109     jdk.crypto.ec \
 
   109     jdk.crypto.cryptoki \
 
       
   110     jdk.dynalink \
 
   110     jdk.dynalink \
 
       
   111     jdk.incubator.httpclient \
 
       
   112     jdk.internal.vm.compiler \
 
   111     jdk.jsobject \
 
   113     jdk.jsobject \
 
   112     jdk.localedata \
 
   114     jdk.localedata \
 
   113     jdk.naming.dns \
 
   115     jdk.naming.dns \
 
   114     jdk.scripting.nashorn \
 
   116     jdk.scripting.nashorn \
 
   115     jdk.security.auth \
 
   117     jdk.security.auth \
 
   116     jdk.security.jgss \
 
   118     jdk.security.jgss \
 
   117     jdk.internal.vm.compiler \
 
       
   118     jdk.xml.dom \
 
   119     jdk.xml.dom \
 
   119     jdk.zipfs \
 
   120     jdk.zipfs \
 
   120     #
 
   121     #
 
       
   122 
       
   123 ifeq ($(OPENJDK_TARGET_OS), windows)
 
       
   124   PLATFORM_MODULES += jdk.crypto.mscapi
 
       
   125 endif
 
       
   126 
       
   127 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
       
   128   PLATFORM_MODULES += jdk.crypto.ucrypto
 
       
   129 endif
 
   121 
   130 
   122 JRE_TOOL_MODULES += \
 
   131 JRE_TOOL_MODULES += \
 
   123     jdk.jdwp.agent \
 
   132     jdk.jdwp.agent \
 
   124     jdk.pack \
 
   133     jdk.pack \
 
   125     jdk.scripting.nashorn.shell \
 
   134     jdk.scripting.nashorn.shell \
 
   126     #
 
   135     #
 
   127 
   136 
   128 ifeq ($(OPENJDK_TARGET_OS), windows)
 
   137 ################################################################################
 
   129   PLATFORM_MODULES += jdk.crypto.mscapi
 
   138 
   130 endif
 
   139 # DOCS_MODULES defines the root modules for javadoc generation.
 
   131 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
   140 # All of their `require transitive` modules directly and indirectly will be included.
 
   132   PLATFORM_MODULES += jdk.crypto.ucrypto
 
   141 DOCS_MODULES += \
 
   133 endif
 
   142     java.se.ee \
 
       
   143     java.smartcardio \
 
       
   144     jdk.accessibility \
 
       
   145     jdk.attach \
 
       
   146     jdk.charsets \
 
       
   147     jdk.compiler \
 
       
   148     jdk.crypto.cryptoki \
 
       
   149     jdk.crypto.ec \
 
       
   150     jdk.dynalink \
 
       
   151     jdk.editpad \
 
       
   152     jdk.httpserver \
 
       
   153     jdk.incubator.httpclient \
 
       
   154     jdk.jartool \
 
       
   155     jdk.javadoc \
 
       
   156     jdk.jconsole \
 
       
   157     jdk.jdeps \
 
       
   158     jdk.jdi \
 
       
   159     jdk.jlink \
 
       
   160     jdk.jshell \
 
       
   161     jdk.localedata \
 
       
   162     jdk.management \
 
       
   163     jdk.naming.dns \
 
       
   164     jdk.naming.rmi \
 
       
   165     jdk.net \
 
       
   166     jdk.scripting.nashorn \
 
       
   167     jdk.sctp \
 
       
   168     jdk.security.auth \
 
       
   169     jdk.security.jgss \
 
       
   170     jdk.xml.dom \
 
       
   171     jdk.zipfs \
 
       
   172     #
 
   134 
   173 
   135 # These modules are included in the interim image which is used to run profiling
 
   174 # These modules are included in the interim image which is used to run profiling
 
   136 # before building the real images.
 
   175 # before building the real images.
 
   137 INTERIM_IMAGE_MODULES := java.base java.logging
 
   176 INTERIM_IMAGE_MODULES := java.base java.logging
 
   138 
   177 
   327       ifeq ($$(classloader), boot)
 
   366       ifeq ($$(classloader), boot)
 
   328         BOOT_MODULES += $1
 
   367         BOOT_MODULES += $1
 
   329       else ifeq ($$(classloader), ext)
 
   368       else ifeq ($$(classloader), ext)
 
   330         PLATFORM_MODULES += $1
 
   369         PLATFORM_MODULES += $1
 
   331       endif
 
   370       endif
 
       
   371       DOCS_MODULES += $1
 
   332     else
 
   372     else
 
   333       # Default to include in all
 
   373       # Default to include in all
 
   334       JRE_MODULES += $1
 
   374       JRE_MODULES += $1
 
   335       JDK_MODULES += $1
 
   375       JDK_MODULES += $1
 
   336     endif
 
   376     endif
jdk-sandbox