equal
deleted
inserted
replaced
114 |
114 |
115 # Use this file inside the image as target for make rule |
115 # Use this file inside the image as target for make rule |
116 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX) |
116 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX) |
117 |
117 |
118 JLINK_ORDER_RESOURCES := **module-info.class |
118 JLINK_ORDER_RESOURCES := **module-info.class |
|
119 JLINK_JLI_CLASSES := |
119 ifeq ($(ENABLE_GENERATE_CLASSLIST), true) |
120 ifeq ($(ENABLE_GENERATE_CLASSLIST), true) |
120 JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist |
121 JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist |
|
122 JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out |
121 endif |
123 endif |
122 JLINK_ORDER_RESOURCES += \ |
124 JLINK_ORDER_RESOURCES += \ |
123 /java.base/java/** \ |
125 /java.base/java/** \ |
124 /java.base/jdk/** \ |
126 /java.base/jdk/** \ |
125 /java.base/sun/** \ |
127 /java.base/sun/** \ |
129 |
131 |
130 JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \ |
132 JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \ |
131 --endian $(OPENJDK_BUILD_CPU_ENDIAN) \ |
133 --endian $(OPENJDK_BUILD_CPU_ENDIAN) \ |
132 --release-info $(BASE_RELEASE_FILE) \ |
134 --release-info $(BASE_RELEASE_FILE) \ |
133 --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ |
135 --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ |
|
136 $(JLINK_JLI_CLASSES) \ |
134 # |
137 # |
135 |
138 |
136 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true) |
139 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true) |
137 JLINK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods |
140 JLINK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods |
138 endif |
141 endif |