--- a/make/CreateJmods.gmk Wed Jul 05 22:34:05 2017 +0200
+++ b/make/CreateJmods.gmk Mon Dec 12 18:56:32 2016 -0800
@@ -79,6 +79,16 @@
DEPS += $(call CacheFind, $(MAN_DIR))
endif
+LEGAL_NOTICES := \
+ $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
+ $(call FindModuleLegalDirs, $(MODULE)) \
+ #
+
+LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
+DEPS += $(call CacheFind, $(LEGAL_NOTICES))
+
+JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
+
# Add dependencies on other jmod files. Only java.base needs access to other
# jmods.
ifeq ($(MODULE), java.base)
@@ -112,7 +122,6 @@
DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))
endif
-# TODO: What about headers?
# Create jmods in a temp dir and then move them into place to keep the
# module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
$(JMODS_DIR)/$(MODULE).jmod: $(DEPS)