84 |
84 |
85 # If a specific modules_legal dir exists for this module, only pick up files |
85 # If a specific modules_legal dir exists for this module, only pick up files |
86 # from there. These files were explicitly filtered or modified in <module>-copy |
86 # from there. These files were explicitly filtered or modified in <module>-copy |
87 # targets. For the rest, just pick up everything from the source legal dirs. |
87 # targets. For the rest, just pick up everything from the source legal dirs. |
88 LEGAL_NOTICES := \ |
88 LEGAL_NOTICES := \ |
89 $(SUPPORT_OUTPUTDIR)/modules_legal/common \ |
89 $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/common) \ |
90 $(if $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ |
90 $(if $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ |
91 $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ |
91 $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ |
92 $(call FindModuleLegalSrcDirs, $(MODULE)) \ |
92 $(call FindModuleLegalSrcDirs, $(MODULE)) \ |
93 ) |
93 ) |
94 |
94 |
95 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) |
95 ifneq ($(strip $(LEGAL_NOTICES)), ) |
96 DEPS += $(call FindFiles, $(LEGAL_NOTICES)) |
96 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) |
|
97 DEPS += $(call FindFiles, $(LEGAL_NOTICES)) |
97 |
98 |
98 JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH) |
99 JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH) |
|
100 endif |
99 |
101 |
100 ifeq ($(filter-out jdk.incubator.%, $(MODULE)), ) |
102 ifeq ($(filter-out jdk.incubator.%, $(MODULE)), ) |
101 JMOD_FLAGS += --do-not-resolve-by-default |
103 JMOD_FLAGS += --do-not-resolve-by-default |
102 JMOD_FLAGS += --warn-if-resolved=incubating |
104 JMOD_FLAGS += --warn-if-resolved=incubating |
103 endif |
105 endif |