From d8c7cf7073a96c47e7cab98fce525fa1f4d17d24 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Mon, 28 Nov 2016 11:36:15 -0800
Subject: [PATCH] 8169816: Move src.zip and jrt-fs.jar under the lib directory

Reviewed-by: alanb, erikj
---
 make/Images.gmk   | 14 ++------------
 make/JrtfsJar.gmk |  2 +-
 make/Main.gmk     | 13 ++++++-------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/make/Images.gmk b/make/Images.gmk
index 1ee70716b81..a20b930c249 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -354,11 +354,11 @@ JDK_TARGETS += $(JDK_DOC_TARGETS)
 ################################################################################
 # src.zip
 
-$(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
+$(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
 	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
 	$(install-file)
 
-JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
+JDK_TARGETS += $(JDK_IMAGE_DIR)/lib/src.zip
 
 ################################################################################
 # /demo dir
@@ -400,16 +400,6 @@ $(eval $(call SetupCopyFiles, COPY_SAMPLES, \
 
 JDK_TARGETS += $(COPY_SAMPLES)
 
-################################################################################
-# jrt-fs.jar
-
-$(eval $(call SetupCopyFiles,COPY_JRTFS_JAR, \
-    SRC := $(SUPPORT_OUTPUTDIR), \
-    DEST := $(JDK_IMAGE_DIR), \
-    FILES := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar))
-
-JDK_TARGETS += $(COPY_JRTFS_JAR)
-
 ################################################################################
 # Code coverage data files
 
diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
index 36ba0beba2b..a95049030ea 100644
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@@ -65,7 +65,7 @@ $(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
 $(eval $(call SetupJarArchive,BUILD_JRTFS_JAR, \
     DEPENDENCIES := $(BUILD_JRTFS) $(COPY_JIMAGE_SERVICE_PROVIDER), \
     SRCS := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
-    JAR := $(SUPPORT_OUTPUTDIR)/jrt-fs.jar, \
+    JAR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jrt-fs.jar, \
     MANIFEST := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \
 ))
 
diff --git a/make/Main.gmk b/make/Main.gmk
index d5d0802d70f..1add025480c 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -603,12 +603,12 @@ else
 
   jdk.jdeps-gendata: java rmic
 
-  # Declare dependencies between jmod targets. Only java.base jmod needs access
-  # to the other jmods to be built.
+  # Declare dependencies between jmod targets.
+  # java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
   # When creating a BUILDJDK, we don't need to add hashes to java.base, thus
   # we don't need to depend on all other jmods
   ifneq ($(CREATING_BUILDJDK), true)
-    java.base-jmod: $(filter-out java.base-jmod \
+    java.base-jmod: jrtfs-jar $(filter-out java.base-jmod \
         $(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS))
   endif
 
@@ -679,11 +679,10 @@ else
     java.base-jmod jdk-image jre-image: generate-link-opt-data
   endif
 
-  jdk-image: jmods zip-source create-source-revision-tracker demos samples \
-      jrtfs-jar
-  jre-image: jmods create-source-revision-tracker jrtfs-jar
+  jdk-image: jmods zip-source create-source-revision-tracker demos samples
+  jre-image: jmods create-source-revision-tracker
 
-  profiles: jmods zip-source create-source-revision-tracker jrtfs-jar
+  profiles: jmods zip-source create-source-revision-tracker
 
   mac-bundles-jdk: jdk-image jre-image