summaryrefslogtreecommitdiffstats
path: root/src/junit/com
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-05-04 01:12:25 +0200
committerSven Gothel <[email protected]>2012-05-04 01:12:25 +0200
commitcc76889a6fe96cffb91c9a3aa7934878c0ecd97e (patch)
tree229403dd5b617a60065e2f77ecee48158a1d5e6a /src/junit/com
parentce9ace37ca883a844fbab7aef8c85197282442ed (diff)
Use ClassLoader to find JNI native libraries. ClassLoader was only used for tool native libraries.
NativeLibrary: Expose 'String findLibrary(String libName, ClassLoader loader)', allowing utilization of System.load(loader.findLibrary(libName)). JNILibLoaderBase.loadLibrary(): Add optional ClassLoader argument, used to locate the library DynamicLibraryBundle: Use DynamicLibraryInfo's ClassLoader to find native libraries (tool + jni)
Diffstat (limited to 'src/junit/com')
-rw-r--r--src/junit/com/jogamp/gluegen/test/junit/generation/BindingJNILibLoader.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/BindingJNILibLoader.java b/src/junit/com/jogamp/gluegen/test/junit/generation/BindingJNILibLoader.java
index 5fc2df7..23daa6d 100644
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/BindingJNILibLoader.java
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/BindingJNILibLoader.java
@@ -36,7 +36,7 @@ public class BindingJNILibLoader extends JNILibLoaderBase {
public static void loadBindingtest1p1() {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
- loadLibrary("Bindingtest1p1", null, true);
+ loadLibrary("Bindingtest1p1", null, true, BindingJNILibLoader.class.getClassLoader());
return null;
}
});
@@ -45,7 +45,7 @@ public class BindingJNILibLoader extends JNILibLoaderBase {
public static void loadBindingtest1p2() {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
- loadLibrary("Bindingtest1p2", null, true);
+ loadLibrary("Bindingtest1p2", null, true, BindingJNILibLoader.class.getClassLoader());
return null;
}
});