Review Request JDK-8169925: Organize licenses by module in source, JMOD file, and run-time image

[Mandy Chung]

> On Dec 9, 2016, at 11:51 PM, Erik Joelsson <erik.joelsson at oracle.com> wrote:
> 
> Hello Mandy,
> 
> In Copy-java.base.gmk. Modules.gmk is no longer needed. JMOD_* varaibles are no longer used.
> 

Good catch.

> In Main.gmk, it would be good with a comment explaining why the jmods need java.base-copy. Something like:
> 
> # All modules include the main license files from java.base.
> 
> Otherwise I'm ok with the build changes now.

Updated per your comment:

$ hg diff make/copy/Copy-java.base.gmk 
diff --git a/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk
--- a/make/copy/Copy-java.base.gmk
+++ b/make/copy/Copy-java.base.gmk
@@ -233,3 +233,17 @@
 endif
 
 ################################################################################
+
+# JDK license and assembly exception files to be packaged in JMOD
+
+JDK_LICENSE ?= $(JDK_TOPDIR)/LICENSE
+JDK_NOTICE  ?= $(JDK_TOPDIR)/ASSEMBLY_EXCEPTION
+
+$(eval $(call SetupCopyFiles, COPY_JDK_NOTICES, \
+    FILES := $(JDK_LICENSE) $(JDK_NOTICE), \
+    DEST := $(LEGAL_DST_DIR), \
+    FLATTEN := true, \
+))
+
+TARGETS += $(COPY_JDK_NOTICES)
+


$ hg diff make/Main.gmk 
diff --git a/make/Main.gmk b/make/Main.gmk
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -659,6 +659,9 @@
         exploded-image-optimize
   endif
 
+  # All modules include the main license files from java.base.
+  $(JMOD_TARGETS): java.base-copy
+
   zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
       $(filter jdk.crypto%, $(JAVA_TARGETS))