From c1bddb32459b1834a987a466771a75731746955d Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 16 Nov 2016 17:20:26 +0100 Subject: [android] Remove mbgl::gl::InitializeExtensions from test JNI_OnLoad --- platform/android/src/test/main.jni.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/platform/android/src/test/main.jni.cpp b/platform/android/src/test/main.jni.cpp index 031450d299..a2fd92bfaf 100644 --- a/platform/android/src/test/main.jni.cpp +++ b/platform/android/src/test/main.jni.cpp @@ -1,12 +1,12 @@ #include "../jni.hpp" -#include -#include #include #include #pragma clang diagnostic ignored "-Wunused-parameter" +#define MAKE_NATIVE_METHOD(name, sig) jni::MakeNativeMethod( #name, sig ) + void runAllTests(JNIEnv *env, jni::jobject* obj) { std::cout << "Starting tests"; mbgl::runTests(0, nullptr); @@ -17,15 +17,10 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { mbgl::android::theJVM = vm; - mbgl::gl::InitializeExtensions([] (const char * name) { - return reinterpret_cast(eglGetProcAddress(name)); - }); - struct Main { static constexpr auto Name() { return "Main"; } }; jni::JNIEnv& env = jni::GetEnv(*vm, jni::jni_version_1_6); - #define MAKE_NATIVE_METHOD(name, sig) jni::MakeNativeMethod( #name, sig ) jni::RegisterNatives(env, jni::Class
::Find(env), MAKE_NATIVE_METHOD(runAllTests, "()V")); return JNI_VERSION_1_6; -- cgit v1.2.1