1 files changed, 21 insertions, 6 deletions
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
index 50c4950a0..841d50f5f 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java
@@ -51,7 +51,14 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle
         super();
     }
 
-    /** Might be a desktop GL library, and might need to allow symbol access to subsequent libs */
+    /** 
+     * Might be a desktop GL library, and might need to allow symbol access to subsequent libs.
+     * 
+     * This respects old DRI requirements:<br>
+     * <pre>
+     * http://dri.sourceforge.net/doc/DRIuserguide.html
+     * </pre>
+     */
     public boolean shallLinkGlobal() { return true; }
     
     public boolean shallLookupGlobal() {
@@ -74,19 +81,27 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle
     }
 
     public final boolean useToolGetProcAdressFirst(String funcName) {
-        return false; // JAU / FIXME funcName.startsWith("egl");
+        if ( AndroidVersion.isAvailable ) {
+            // Android requires global dlsym lookup
+            return false;
+        } else {
+            return true;
+        }
     }
     
     protected List<String> getEGLLibNamesList() {
         List<String> eglLibNames = new ArrayList<String>();
         
-        // try default generic names first 
-        eglLibNames.add("EGL");        
+        // this is the default EGL lib name, according to the spec 
+        eglLibNames.add("libEGL.so.1");
+        
+        // try these as well, if spec fails
+        eglLibNames.add("libEGL.so");
+        eglLibNames.add("EGL");
+        
         // for windows distributions using the 'unlike' lib prefix, 
         // where our tool does not add it.
         eglLibNames.add("libEGL");
-        // this is the default EGL lib name, according to the spec 
-        eglLibNames.add("libEGL.so.1");
         
         return eglLibNames;
     }