summaryrefslogtreecommitdiff
path: root/platform/android/src/jni.cpp
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2016-06-23 16:39:27 +0200
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2016-11-27 18:50:24 +0200
commitc810d16f0d2787f15e06651ea595020415d5a8d5 (patch)
tree216b098897a887f5c1a8fff0aa78350e75445e52 /platform/android/src/jni.cpp
parent5ae92de618e5242f6a8a30485b5ecaa9ef0ebb5e (diff)
downloadqtlocation-mapboxgl-c810d16f0d2787f15e06651ea595020415d5a8d5.tar.gz
[android][build] core tests - initial setup for rendering tests
Diffstat (limited to 'platform/android/src/jni.cpp')
-rwxr-xr-xplatform/android/src/jni.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 0c740d7fdd..5471fb5508 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -1703,9 +1703,12 @@ void updateOfflineRegionMetadata(JNIEnv *env, jni::jobject* offlineRegion_, jni:
// Offline calls end
-}
+} // anonymous
-extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+namespace mbgl {
+namespace android {
+
+void registerNatives(JavaVM *vm) {
theJVM = vm;
jni::JNIEnv& env = jni::GetEnv(*vm, jni::jni_version_1_6);
@@ -1988,6 +1991,7 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
char release[PROP_VALUE_MAX] = "";
__system_property_get("ro.build.version.release", release);
androidRelease = std::string(release);
-
- return JNI_VERSION_1_6;
}
+
+} // android
+} // mbgl