equal
deleted
inserted
replaced
27 |
27 |
28 include $(SPEC) |
28 include $(SPEC) |
29 include MakeBase.gmk |
29 include MakeBase.gmk |
30 |
30 |
31 TOOL_TARGETS := |
31 TOOL_TARGETS := |
32 JDK_TARGETS := |
32 JDK_TARGETS := |
33 JRE_TARGETS := |
33 JRE_TARGETS := |
34 |
34 |
35 # Hook to include the corresponding custom file, if present. |
35 # Hook to include the corresponding custom file, if present. |
36 $(eval $(call IncludeCustomExtension, , Images-pre.gmk)) |
36 $(eval $(call IncludeCustomExtension, , Images-pre.gmk)) |
37 |
37 |
67 # compact3 builds have additional modules |
67 # compact3 builds have additional modules |
68 JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \ |
68 JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \ |
69 jdk.naming.rmi jdk.sctp jdk.security.auth |
69 jdk.naming.rmi jdk.sctp jdk.security.auth |
70 |
70 |
71 # Replacing double-comma with a single comma is to workaround the issue |
71 # Replacing double-comma with a single comma is to workaround the issue |
72 # with some version of make on windows that doesn't substitute spaces |
72 # with some version of make on windows that doesn't substitute spaces |
73 # with one comma properly as with make 4.0 |
73 # with one comma properly as with make 4.0 |
74 define SubstComma |
74 define SubstComma |
75 $(subst $(COMMA)$(COMMA),$(COMMA),$(subst $(SPACE),$(COMMA),$(strip $1))) |
75 $(subst $(COMMA)$(COMMA),$(COMMA),$(subst $(SPACE),$(COMMA),$(strip $1))) |
76 endef |
76 endef |
77 JRE_MODULES_LIST := $(call SubstComma, $(JRE_MODULES)) |
77 JRE_MODULES_LIST := $(call SubstComma, $(JRE_MODULES)) |