From d1f85378743ec7215a874dc1b14c5d6f217c3c4f Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Thu, 4 Jun 2015 18:28:52 +0200
Subject: [PATCH] 8081814: Modularize the deploy build

Reviewed-by: ihse, ddehaven
---
 jdk/make/CopySamples.gmk                              |  2 +-
 jdk/make/lib/LibCommon.gmk                            | 11 -----------
 .../src/classes/build/tools/module/ModuleArchive.java |  3 ++-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/jdk/make/CopySamples.gmk b/jdk/make/CopySamples.gmk
index 37a1d21ebce..be20f92fd17 100644
--- a/jdk/make/CopySamples.gmk
+++ b/jdk/make/CopySamples.gmk
@@ -28,7 +28,7 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
-SAMPLE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/sample
+SAMPLE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/sample/image
 SAMPLE_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/share
 SAMPLE_CLOSED_SOURCE_DIR := $(JDK_TOPDIR)/src/closed/sample/share
 SAMPLE_SOLARIS_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/solaris
diff --git a/jdk/make/lib/LibCommon.gmk b/jdk/make/lib/LibCommon.gmk
index 250f8f44b2c..93833d57a94 100644
--- a/jdk/make/lib/LibCommon.gmk
+++ b/jdk/make/lib/LibCommon.gmk
@@ -59,17 +59,6 @@ FindSrcDirsForLib = \
       $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
       $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
 
-################################################################################
-# Find lib dir for module
-# Param 1 - module name
-ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-  FindLibDirForModule = \
-      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR)
-else
-  FindLibDirForModule = \
-      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
-endif
-
 ################################################################################
 # Find a library
 # Param 1 - module name
diff --git a/jdk/make/src/classes/build/tools/module/ModuleArchive.java b/jdk/make/src/classes/build/tools/module/ModuleArchive.java
index 716e8b99361..ae207dbb372 100644
--- a/jdk/make/src/classes/build/tools/module/ModuleArchive.java
+++ b/jdk/make/src/classes/build/tools/module/ModuleArchive.java
@@ -228,7 +228,8 @@ public class ModuleArchive implements Archive {
         private static String nativeDir(String filename) {
             if (System.getProperty("os.name").startsWith("Windows")) {
                 if (filename.endsWith(".dll") || filename.endsWith(".diz")
-                    || filename.endsWith(".pdb") || filename.endsWith(".map")) {
+                    || filename.endsWith(".pdb") || filename.endsWith(".map")
+                    || filename.endsWith(".cpl")) {
                     return "bin";
                 } else {
                     return "lib";