From b4793617472a1db8e8a980b7ea667a67a580ca7a Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Fri, 12 Dec 2014 15:35:21 +0100
Subject: [PATCH] 8067254: No debug symbols in JPRT Windows builds

Reviewed-by: tbell
---
 jdk/make/src/classes/build/tools/module/ModuleArchive.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jdk/make/src/classes/build/tools/module/ModuleArchive.java b/jdk/make/src/classes/build/tools/module/ModuleArchive.java
index f05020b9842..716e8b99361 100644
--- a/jdk/make/src/classes/build/tools/module/ModuleArchive.java
+++ b/jdk/make/src/classes/build/tools/module/ModuleArchive.java
@@ -227,10 +227,12 @@ public class ModuleArchive implements Archive {
 
         private static String nativeDir(String filename) {
             if (System.getProperty("os.name").startsWith("Windows")) {
-                if (filename.endsWith(".dll"))
+                if (filename.endsWith(".dll") || filename.endsWith(".diz")
+                    || filename.endsWith(".pdb") || filename.endsWith(".map")) {
                     return "bin";
-                 else
+                } else {
                     return "lib";
+                }
             } else {
                 return "lib";
             }