equal
deleted
inserted
replaced
90 JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \ |
90 JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \ |
91 --module-path $(IMAGES_OUTPUTDIR)/jmods \ |
91 --module-path $(IMAGES_OUTPUTDIR)/jmods \ |
92 --endian $(OPENJDK_BUILD_CPU_ENDIAN) \ |
92 --endian $(OPENJDK_BUILD_CPU_ENDIAN) \ |
93 --release-info $(BASE_RELEASE_FILE) \ |
93 --release-info $(BASE_RELEASE_FILE) \ |
94 --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ |
94 --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ |
|
95 --dedup-legal-notices=error-if-not-same-content \ |
95 $(JLINK_JLI_CLASSES) \ |
96 $(JLINK_JLI_CLASSES) \ |
96 # |
97 # |
97 |
98 |
98 JLINK_JRE_EXTRA_OPTS := --no-man-pages --no-header-files --strip-debug |
99 JLINK_JRE_EXTRA_OPTS := --no-man-pages --no-header-files --strip-debug |
99 |
100 |
285 endif # Windows |
286 endif # Windows |
286 |
287 |
287 ################################################################################ |
288 ################################################################################ |
288 # doc files |
289 # doc files |
289 |
290 |
290 JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
|
291 JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
|
292 JRE_DOC_LOCATION ?= $(JDK_TOPDIR) |
291 JRE_DOC_LOCATION ?= $(JDK_TOPDIR) |
293 JDK_DOC_LOCATION ?= $(JDK_TOPDIR) |
292 JDK_DOC_LOCATION ?= $(JDK_TOPDIR) |
294 |
293 |
295 JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES)) |
294 JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES)) |
296 JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES)) |
295 JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES)) |