summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-16 17:20:26 +0100
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-17 01:04:18 +0100
commitc1bddb32459b1834a987a466771a75731746955d (patch)
tree1aa58e6c9b74564435baf1566838a2149bea7b41
parent5a8f0d25d245ffbabdf1d38822e53364f6296091 (diff)
downloadqtlocation-mapboxgl-c1bddb32459b1834a987a466771a75731746955d.tar.gz
[android] Remove mbgl::gl::InitializeExtensions from test JNI_OnLoad
-rw-r--r--platform/android/src/test/main.jni.cpp9
1 files 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 <EGL/egl.h>
-#include <mbgl/gl/extension.hpp>
#include <jni/jni.hpp>
#include <mbgl/test.hpp>
#pragma clang diagnostic ignored "-Wunused-parameter"
+#define MAKE_NATIVE_METHOD(name, sig) jni::MakeNativeMethod<decltype(name), name>( #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<mbgl::gl::glProc>(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<decltype(name), name>( #name, sig )
jni::RegisterNatives(env, jni::Class<Main>::Find(env), MAKE_NATIVE_METHOD(runAllTests, "()V"));
return JNI_VERSION_1_6;