changeset 10208:742f76dae86d jdk-9+150

8171450: JavaFX native libraries are no longer loaded after fix for JDK-8066474 Reviewed-by: ddhill
author kcr
date Mon, 19 Dec 2016 14:37:29 -0800
parents ca883edfe9e0
children 78c56094ab79 2bae8f04958b
files build.gradle
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Fri Dec 16 18:37:07 2016 -0800
+++ b/build.gradle	Mon Dec 19 14:37:29 2016 -0800
@@ -3748,6 +3748,18 @@
                     from srcMakeDir
                     into dstMakeDir
                 }
+
+                // FIXME: The following is a temporary fix for JDK-8171450.
+                // It should be removed once the rest of the build logic is
+                // updated to look for native libs in the lib/ directory on
+                // Linux and not in lib/$ARCH/
+                if (IS_LINUX) {
+                    copy {
+                        from "${modulesLibsDir}/${moduleName}/$OS_ARCH"
+                        into "${modulesLibsDir}/${moduleName}"
+                        include "*.so"
+                    }
+                }
             }
 
             // Copy dependencies/*/module-info.java.extra