From 2f6cd9b7777292fc811060a6844982790d1d8eef Mon Sep 17 00:00:00 2001
From: Glenn Watson <gw@intuitionlibrary.com>
Date: Thu, 31 Jul 2014 14:09:49 +1000
Subject: [PATCH] Now that glut is statically linked, fetch the symbols from
 libservo instead.

---
 jni/main.cpp | 49 +++++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/jni/main.cpp b/jni/main.cpp
index fc24b3a..655c77f 100644
--- a/jni/main.cpp
+++ b/jni/main.cpp
@@ -97,34 +97,27 @@ static void init_servo()
         return;
     }
 
-    LOGI("load rust-glut library");
-    void* libglut = android_dlopen("/data/data/com.example.ServoAndroid/lib/libglut-16b1121d-0.1.so");
-    if (libglut == NULL) {
-        LOGW("failed to load rust-glut lib: %s", dlerror());
-        return;
-    }
-
-    REGISTER_FUNCTION(libglut, glutMainLoopEvent);
-    REGISTER_FUNCTION(libglut, glutInit);
-    REGISTER_FUNCTION(libglut, glutInitDisplayMode);
-    REGISTER_FUNCTION(libglut, glutCreateWindow);
-    REGISTER_FUNCTION(libglut, glutDestroyWindow);
-    REGISTER_FUNCTION(libglut, glutPostRedisplay);
-    REGISTER_FUNCTION(libglut, glutSwapBuffers);
-    REGISTER_FUNCTION(libglut, glutGetWindow);
-    REGISTER_FUNCTION(libglut, glutSetWindow);
-    REGISTER_FUNCTION(libglut, glutReshapeWindow);
-    REGISTER_FUNCTION(libglut, glutDisplayFunc);
-    REGISTER_FUNCTION(libglut, glutReshapeFunc);
-    REGISTER_FUNCTION(libglut, glutTimerFunc);
-    REGISTER_FUNCTION(libglut, glutGet);
-    REGISTER_FUNCTION(libglut, glutKeyboardFunc);
-    REGISTER_FUNCTION(libglut, glutMouseFunc);
-    REGISTER_FUNCTION(libglut, glutMouseWheelFunc);
-    REGISTER_FUNCTION(libglut, glutSetWindowTitle);
-    REGISTER_FUNCTION(libglut, glutIdleFunc);
-    REGISTER_FUNCTION(libglut, glutInitWindowSize);
-    REGISTER_FUNCTION(libglut, glutGetModifiers);
+    REGISTER_FUNCTION(libservo, glutMainLoopEvent);
+    REGISTER_FUNCTION(libservo, glutInit);
+    REGISTER_FUNCTION(libservo, glutInitDisplayMode);
+    REGISTER_FUNCTION(libservo, glutCreateWindow);
+    REGISTER_FUNCTION(libservo, glutDestroyWindow);
+    REGISTER_FUNCTION(libservo, glutPostRedisplay);
+    REGISTER_FUNCTION(libservo, glutSwapBuffers);
+    REGISTER_FUNCTION(libservo, glutGetWindow);
+    REGISTER_FUNCTION(libservo, glutSetWindow);
+    REGISTER_FUNCTION(libservo, glutReshapeWindow);
+    REGISTER_FUNCTION(libservo, glutDisplayFunc);
+    REGISTER_FUNCTION(libservo, glutReshapeFunc);
+    REGISTER_FUNCTION(libservo, glutTimerFunc);
+    REGISTER_FUNCTION(libservo, glutGet);
+    REGISTER_FUNCTION(libservo, glutKeyboardFunc);
+    REGISTER_FUNCTION(libservo, glutMouseFunc);
+    REGISTER_FUNCTION(libservo, glutMouseWheelFunc);
+    REGISTER_FUNCTION(libservo, glutSetWindowTitle);
+    REGISTER_FUNCTION(libservo, glutIdleFunc);
+    REGISTER_FUNCTION(libservo, glutInitWindowSize);
+    REGISTER_FUNCTION(libservo, glutGetModifiers);
 
     void (*main)(int, char**);
     *(void**)(&main) = dlsym(libservo, "android_start");