# HG changeset patch
# User kcr
# Date 1441294335 25200
#      Thu Sep 03 08:32:15 2015 -0700
# Node ID 960c78fd109b0f08dd070975d07ef0087cff56b1
# Parent  7ea96ef06a69fc0b531181647df5647a126b8d82
8134725: Gradle openZip task does not support JDK9 layout

diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -3305,6 +3305,7 @@
             copy {
                 from "${sdkDir}"
                 into "${exportSDKDir}"
+                includeEmptyDirs = false
                 exclude '**/jfxrt.jar'
 
                 if (isWindows) {
@@ -3313,7 +3314,7 @@
 
                 eachFile {details ->
                     if (details.path.startsWith('rt/')) {
-                        details.path = 'jre/' + details.path.substring(3);
+                        details.path = "./" + details.path.substring(3);
                     }
                 }
             }
@@ -3323,10 +3324,10 @@
                 into "${exportTmp}"
             }
 
-            mkdir "${exportSDKDir}/jre/lib/ext"
+            mkdir "${exportSDKDir}/lib"
 
             ant.jar(
-                    destfile: "${exportSDKDir}/jre/lib/ext/jfxrt.jar",
+                    destfile: "${exportSDKDir}/lib/jfxrt.jar",
                     index: true,
                     compress: compressJar
                 ) {