equal
deleted
inserted
replaced
47 |
47 |
48 ################################################################################ |
48 ################################################################################ |
49 |
49 |
50 LINK_OPT_DIR := $(SUPPORT_OUTPUTDIR)/link_opt |
50 LINK_OPT_DIR := $(SUPPORT_OUTPUTDIR)/link_opt |
51 CLASSLIST_FILE := $(LINK_OPT_DIR)/classlist |
51 CLASSLIST_FILE := $(LINK_OPT_DIR)/classlist |
52 JLI_TRACE_FILE := $(LINK_OPT_DIR)/jli_trace.out |
52 JLI_TRACE_FILE := $(LINK_OPT_DIR)/default_jli_trace.txt |
53 |
53 |
54 # If an external buildjdk has been supplied, we don't build a separate interim |
54 # If an external buildjdk has been supplied, we don't build a separate interim |
55 # image, so just use the external build jdk instead. |
55 # image, so just use the external build jdk instead. |
56 ifeq ($(EXTERNAL_BUILDJDK), true) |
56 ifeq ($(EXTERNAL_BUILDJDK), true) |
57 INTERIM_IMAGE_DIR := $(BUILD_JDK) |
57 INTERIM_IMAGE_DIR := $(BUILD_JDK) |
67 build.tools.classlist.HelloClasslist \ |
67 build.tools.classlist.HelloClasslist \ |
68 $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE) |
68 $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE) |
69 |
69 |
70 # The jli trace is created by the same recipe as classlist. By declaring these |
70 # The jli trace is created by the same recipe as classlist. By declaring these |
71 # dependencies, make will correctly rebuild both jli trace and classlist |
71 # dependencies, make will correctly rebuild both jli trace and classlist |
72 # incrementally using the single recpie above. |
72 # incrementally using the single recipe above. |
73 $(CLASSLIST_FILE): $(JLI_TRACE_FILE) |
73 $(CLASSLIST_FILE): $(JLI_TRACE_FILE) |
74 $(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR) |
74 $(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR) |
75 |
75 |
76 TARGETS += $(CLASSLIST_FILE) $(JLI_TRACE_FILE) |
76 TARGETS += $(CLASSLIST_FILE) $(JLI_TRACE_FILE) |
77 |
77 |
81 DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \ |
81 DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base, \ |
82 )) |
82 )) |
83 |
83 |
84 TARGETS += $(COPY_CLASSLIST) |
84 TARGETS += $(COPY_CLASSLIST) |
85 |
85 |
|
86 # Copy the default_jli_trace.txt file into jdk.jlink |
|
87 $(eval $(call SetupCopyFiles, COPY_JLI_TRACE, \ |
|
88 FILES := $(JLI_TRACE_FILE), \ |
|
89 DEST := $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jlink/internal/plugins, \ |
|
90 )) |
|
91 |
|
92 # Because of the single recipe for jli trace and classlist above, the |
|
93 # COPY_JLI_TRACE rule needs to explicitly add the classlist file as a |
|
94 # prerequisite. |
|
95 $(COPY_JLI_TRACE): $(CLASSLIST_FILE) |
|
96 |
|
97 TARGETS += $(COPY_JLI_TRACE) |
|
98 |
86 ################################################################################ |
99 ################################################################################ |
87 |
100 |
88 all: $(TARGETS) |
101 all: $(TARGETS) |