Implement interposing of dlopen on Android

[apitrace] / dispatch / glproc_gl.cpp

diff --git a/dispatch/glproc_gl.cpp b/dispatch/glproc_gl.cpp
index 8e1216f1dc999c75f2cd16a751f4403b924868f6..1f3e9fc91016820d9b63244717c74d885f1ca7ac 100644 (file)
--- a/dispatch/glproc_gl.cpp
+++ b/dispatch/glproc_gl.cpp
@@ -29,7 +29,7 @@
 
 #if !defined(_WIN32)
 #include <unistd.h> // for symlink
-#include <dlfcn.h>
+#include "dlopen.hpp"
 #endif
 
 
@@ -145,27 +145,6 @@ _getPrivateProcAddress(const char *procName)
 #else
 
 
-/*
- * Invoke the true dlopen() function.
- */
-static void *
-_dlopen(const char *filename, int flag)
-{
-    typedef void * (*PFNDLOPEN)(const char *, int);
-    static PFNDLOPEN dlopen_ptr = NULL;
-
-    if (!dlopen_ptr) {
-        dlopen_ptr = (PFNDLOPEN)dlsym(RTLD_NEXT, "dlopen");
-        if (!dlopen_ptr) {
-            os::log("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
-            return NULL;
-        }
-    }
-
-    return dlopen_ptr(filename, flag);
-}
-
-
 /*
  * Lookup a libGL symbol
  */