fix jogl.all-mobile.jar/jogl_mobile configuration

4 files changed, 15 insertions, 23 deletions

diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
index 6fd3ecf1c..1d2d20f61 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
@@ -31,9 +31,11 @@ package jogamp.opengl.egl;
 import com.jogamp.common.os.DynamicLookupHelper;
 import com.jogamp.common.os.NativeLibrary;
 import java.util.*;
+
 import javax.media.nativewindow.*;
 import javax.media.opengl.*;
 import jogamp.opengl.*;
+
 import java.security.*;
 
 /**
@@ -43,6 +45,12 @@ import java.security.*;
  * Currently two implementations exist, one for ES1 and one for ES2.
  */
 public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundleInfo {
+    static List/*<String>*/ glueLibNames;
+    static {
+        glueLibNames = new ArrayList();
+        glueLibNames.addAll(GLDynamicLibraryBundleInfo.getGlueLibNamesPreload());
+        glueLibNames.add("jogl_mobile");
+    }
 
     protected EGLDynamicLibraryBundleInfo() {
         super();
@@ -72,4 +80,8 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle
         eglLibNames.add("libEGL.so.1");
         return eglLibNames;
     }
+    
+    public final List/*<String>*/ getGlueLibNames() {
+        return glueLibNames;
+    }    
 }
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
index 13da8d3d4..87d7d992f 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES1DynamicLibraryBundleInfo.java
@@ -32,13 +32,6 @@ import java.util.*;
 import jogamp.opengl.*;
 
 public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo {
-    static List/*<String>*/ glueLibNames;
-    static {
-        glueLibNames = new ArrayList();
-        glueLibNames.addAll(GLDynamicLibraryBundleInfo.getGlueLibNamesPreload());
-        glueLibNames.add("jogl_es1");
-    }
-
     protected EGLES1DynamicLibraryBundleInfo() {
         super();
     }
@@ -63,9 +56,5 @@ public class EGLES1DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         libNames.add(getEGLLibNamesList());
         return libNames;
     }
-
-    public List/*<String>*/ getGlueLibNames() {
-        return glueLibNames;
-    }
 }
 
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
index 361f0148e..ec21b3992 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
@@ -32,13 +32,6 @@ import java.util.*;
 import jogamp.opengl.*;
 
 public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo {
-    static List/*<String>*/ glueLibNames;
-    static {
-        glueLibNames = new ArrayList();
-        glueLibNames.addAll(GLDynamicLibraryBundleInfo.getGlueLibNamesPreload());
-        glueLibNames.add("jogl_es2");
-    }
-  
     protected EGLES2DynamicLibraryBundleInfo() {
         super();
     }
@@ -63,9 +56,5 @@ public class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundleInfo
         libNames.add(getEGLLibNamesList());
         return libNames;
     }
-
-    public List/*<String>*/ getGlueLibNames() {
-        return glueLibNames;
-    }
 }
 
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java
index 1f525a643..c5d3389f1 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java
@@ -40,6 +40,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.gl2.GLUgl2;
+import javax.media.opengl.glu.gl2es1.GLUgl2es1;
 
 import org.junit.Test;
 
@@ -73,7 +74,8 @@ public class TestBug463ScaleImageMemoryAWT implements GLEventListener {
         
         ByteBuffer bufferIn  = ByteBuffer.wrap(datain);
         ByteBuffer bufferOut = ByteBuffer.wrap(dataout);      
-        GLUgl2 glu = new GLUgl2();
+        // GLUgl2 glu = new GLUgl2();
+        GLUgl2es1 glu = new GLUgl2es1(); 
         // in the failing case, the system would run out of memory in here
         glu.gluScaleImage( GL.GL_RGBA,
                            widthin, heightin, GL.GL_UNSIGNED_BYTE, bufferIn,