equal
deleted
inserted
replaced
51 |
51 |
52 # Hook to include the corresponding custom file, if present. |
52 # Hook to include the corresponding custom file, if present. |
53 $(eval $(call IncludeCustomExtension, , Main.gmk)) |
53 $(eval $(call IncludeCustomExtension, , Main.gmk)) |
54 |
54 |
55 # All modules for the current target platform. |
55 # All modules for the current target platform. |
56 # Manually add jdk.hotspot.agent for now. |
56 ALL_MODULES := $(call FindAllModules) |
57 ALL_MODULES := $(call FindAllModules) jdk.hotspot.agent |
|
58 |
57 |
59 ################################################################################ |
58 ################################################################################ |
60 ################################################################################ |
59 ################################################################################ |
61 # |
60 # |
62 # Recipes for all targets. Only recipes, dependencies are declared later. |
61 # Recipes for all targets. Only recipes, dependencies are declared later. |
420 |
419 |
421 # This dependency needs to be explicitly declared. jdk.jdi-gensrc generates a |
420 # This dependency needs to be explicitly declared. jdk.jdi-gensrc generates a |
422 # header file used by jdk.jdwp.agent-libs. The jdk.jdwp.agent-gensrc is a |
421 # header file used by jdk.jdwp.agent-libs. The jdk.jdwp.agent-gensrc is a |
423 # virtual target. |
422 # virtual target. |
424 jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc |
423 jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc |
425 |
|
426 # Until the module system is in place, jdk.jdi-gensrc needs to combine service |
|
427 # loader configuration with jdk.hotspot.agent so is dependent on importing |
|
428 # hotspot. |
|
429 jdk.jdi-gensrc-jdk: import-hotspot |
|
430 |
424 |
431 # The swing beans need to have java base properly generated to avoid errors |
425 # The swing beans need to have java base properly generated to avoid errors |
432 # in javadoc. |
426 # in javadoc. |
433 java.desktop-gensrc-jdk: java.base-gensrc |
427 java.desktop-gensrc-jdk: java.base-gensrc |
434 |
428 |