36 $(eval $(call IncludeCustomExtension, , Images-pre.gmk)) |
36 $(eval $(call IncludeCustomExtension, , Images-pre.gmk)) |
37 |
37 |
38 ############################################################################ |
38 ############################################################################ |
39 |
39 |
40 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \ |
40 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \ |
41 jdk.security.auth jdk.security.jgss jdk.runtime |
41 jdk.security.auth jdk.security.jgss jdk.pack200 |
42 |
42 |
43 # providers |
43 # providers |
44 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \ |
44 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \ |
45 jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs |
45 jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs |
46 |
46 |
47 # tools |
47 # tools |
48 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \ |
48 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \ |
49 jdk.hotspot.agent jdk.hprof.agent jdk.jdi jdk.jdwp.agent jdk.rmic \ |
49 jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdi jdk.jdwp.agent \ |
50 jdk.xml.bind jdk.xml.ws |
50 jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws |
51 |
51 |
52 ifeq ($(OPENJDK_TARGET_OS), windows) |
52 ifeq ($(OPENJDK_TARGET_OS), windows) |
53 PROVIDER_MODULES += jdk.crypto.mscapi |
53 PROVIDER_MODULES += jdk.crypto.mscapi |
54 endif |
54 endif |
55 |
55 |
486 FILES := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar)) |
486 FILES := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar)) |
487 |
487 |
488 JDK_TARGETS += $(COPY_JRTFS_JAR) |
488 JDK_TARGETS += $(COPY_JRTFS_JAR) |
489 |
489 |
490 ################################################################################ |
490 ################################################################################ |
|
491 # Code coverage data files |
|
492 |
|
493 ifeq ($(GCOV_ENABLED), true) |
|
494 |
|
495 GCOV_FIND_EXPR := -type f -name "*.gcno" |
|
496 |
|
497 ifeq ($(JVM_VARIANT_CLIENT), true) |
|
498 $(eval $(call SetupCopyFiles,COPY_HOTSPOT_CLIENT_GCOV_GCNO, \ |
|
499 SRC := $(HOTSPOT_OUTPUTDIR), \ |
|
500 DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/client, \ |
|
501 FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler1/ $(GCOV_FIND_EXPR)), \ |
|
502 FLATTEN := true)) |
|
503 |
|
504 SYMBOLS_TARGETS += $(COPY_HOTSPOT_CLIENT_GCOV_GCNO) |
|
505 endif |
|
506 |
|
507 ifeq ($(JVM_VARIANT_SERVER), true) |
|
508 $(eval $(call SetupCopyFiles,COPY_HOTSPOT_SERVER_GCOV_GCNO, \ |
|
509 SRC := $(HOTSPOT_OUTPUTDIR), \ |
|
510 DEST := $(SYMBOLS_IMAGE_DIR)/gcov/hotspot/server, \ |
|
511 FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR)/*compiler2/ $(GCOV_FIND_EXPR)), \ |
|
512 FLATTEN := true)) |
|
513 |
|
514 SYMBOLS_TARGETS += $(COPY_HOTSPOT_SERVER_GCOV_GCNO) |
|
515 endif |
|
516 |
|
517 $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \ |
|
518 SRC := $(SUPPORT_OUTPUTDIR)/native, \ |
|
519 DEST := $(SYMBOLS_IMAGE_DIR)/gcov/jdk, \ |
|
520 FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR)))) |
|
521 |
|
522 SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO) |
|
523 |
|
524 endif |
|
525 |
|
526 ################################################################################ |
491 |
527 |
492 # Include custom post hook here to make it possible to augment the target lists |
528 # Include custom post hook here to make it possible to augment the target lists |
493 # before actual target prerequisites are declared. |
529 # before actual target prerequisites are declared. |
494 $(eval $(call IncludeCustomExtension, , Images-post.gmk)) |
530 $(eval $(call IncludeCustomExtension, , Images-post.gmk)) |
495 |
531 |
496 ################################################################################ |
532 ################################################################################ |
497 |
533 |
498 $(JRE_TARGETS): $(TOOL_JRE_TARGETS) |
534 $(JRE_TARGETS): $(TOOL_JRE_TARGETS) |
499 $(JDK_TARGETS): $(TOOL_JDK_TARGETS) |
535 $(JDK_TARGETS): $(TOOL_JDK_TARGETS) |
500 |
536 |
501 jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) |
537 jimages: $(TOOL_JRE_TARGETS) $(TOOL_JDK_TARGETS) $(JRE_TARGETS) $(JDK_TARGETS) \ |
|
538 $(SYMBOLS_TARGETS) |
502 |
539 |
503 |
540 |
504 $(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS) |
541 $(JRE_COMPACT1_TARGETS): $(TOOL_JRE_COMPACT1_TARGETS) |
505 $(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS) |
542 $(JRE_COMPACT2_TARGETS): $(TOOL_JRE_COMPACT2_TARGETS) |
506 $(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS) |
543 $(JRE_COMPACT3_TARGETS): $(TOOL_JRE_COMPACT3_TARGETS) |