Merge remote-tracking branch 'github-mark/master' (Bug 1023, Bug 1024)

Conflicts:
	src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
	src/java/com/jogamp/common/os/Platform.java
	src/junit/com/jogamp/common/util/TestTempJarCache.java

(re-injected that api-doc of addNativeJarLibsImpl)

1 files changed, 0 insertions, 15 deletions

diff --git a/src/junit/com/jogamp/common/util/TestTempJarCache.java b/src/junit/com/jogamp/common/util/TestTempJarCache.java
index 934fb5e..ce06e9a 100644
--- a/src/junit/com/jogamp/common/util/TestTempJarCache.java
+++ b/src/junit/com/jogamp/common/util/TestTempJarCache.java
@@ -215,21 +215,6 @@ public class TestTempJarCache extends JunitTracer {
     }
 
     @Test
-    public void testTempJarCache03AddNativeJarLibs() throws IOException {
-        if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
-        final String libBaseName = "gluegen-rt";
-
-        JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName);
-        Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName));
-
-        final String libFullPath = TempJarCache.findLibrary(libBaseName);
-        Assert.assertNotNull(libFullPath);
-        Assert.assertEquals(libBaseName, NativeLibrary.isValidNativeLibraryName(libFullPath, true));
-        final File f = new File(libFullPath);
-        Assert.assertTrue(f.exists());
-    }
-
-    @Test
     public void testTempJarCache04aSameClassLoader() throws IOException {
         assertTempFileCachesIndividualInstances(true, TempJarCache.getTempFileCache(), TempJarCache.getTempFileCache());