From 6fb302ab32c7b2189751b5943456847865eb2924 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Sat, 26 Apr 2014 12:12:58 -0500 Subject: [PATCH] Rust upgrade --- jni/main.cpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/jni/main.cpp b/jni/main.cpp index f3c71c7..fc24b3a 100644 --- a/jni/main.cpp +++ b/jni/main.cpp @@ -96,11 +96,6 @@ static void init_servo() LOGW("failed to load servo lib: %s", dlerror()); return; } - void* crate_map = dlsym(libservo, "_rust_crate_map_toplevel"); - if (crate_map == NULL) { - LOGW("failed to load the crate map from the servo lib: %s", dlerror()); - return; - } LOGI("load rust-glut library"); void* libglut = android_dlopen("/data/data/com.example.ServoAndroid/lib/libglut-16b1121d-0.1.so"); @@ -131,21 +126,6 @@ static void init_servo() REGISTER_FUNCTION(libglut, glutInitWindowSize); REGISTER_FUNCTION(libglut, glutGetModifiers); - - LOGI("load libstd library to set the cratemap"); - void* libstd = android_dlopen("/data/data/com.example.ServoAndroid/lib/libstd-31b43f22-0.10-pre.so"); - if (libstd == NULL) { - LOGW("failed to load libstd: %s", dlerror()); - return; - } - - void (*rust_set_crate_map)(void*) = (void (*)(void*))dlsym(libstd, "rust_set_crate_map"); - if (rust_set_crate_map == NULL) { - LOGW("failed to load rust_set_crate_map from libstd: %s", dlerror()); - return; - } - rust_set_crate_map(crate_map); - void (*main)(int, char**); *(void**)(&main) = dlsym(libservo, "android_start"); if (main) {