Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

java: Changed JNI version to 1.6

Browse Source 
This change is needed to compile/run with OpenJDK 7, as well as with
OpenJDK 8.

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Andrei Vasiliu
2016-02-29 15:54:53 +02:00
committed by Brendan Le Foll
parent 350a6489ee
commit df8d471cfb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpio/gpio.c
View File

@@ -246,7 +246,7 @@ static void make_env_key(void)
{ {
JNIEnv *jenv; JNIEnv *jenv;
(*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_8); (*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_6);
jclass rcls = (*jenv)->FindClass(jenv, "java/lang/Runnable"); jclass rcls = (*jenv)->FindClass(jenv, "java/lang/Runnable");
jmethodID runm = (*jenv)->GetMethodID(jenv, rcls, "run", "()V"); jmethodID runm = (*jenv)->GetMethodID(jenv, rcls, "run", "()V");
@@ -481,7 +481,7 @@ mraa_gpio_isr(mraa_gpio_context dev, mraa_gpio_edge_t mode, void (*fptr)(void*),
/* Most UPM sensors use the C API, the global ref must be created here. */ /* Most UPM sensors use the C API, the global ref must be created here. */
/* The reason for checking the callback function is internal callbacks. */ /* The reason for checking the callback function is internal callbacks. */
if (fptr == mraa_java_isr_callback) { if (fptr == mraa_java_isr_callback) {
(*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_8); (*globVM)->GetEnv(globVM, (void **)&jenv, JNI_VERSION_1_6);
jobject grunnable = (*jenv)->NewGlobalRef(jenv, (jobject) args); jobject grunnable = (*jenv)->NewGlobalRef(jenv, (jobject) args);
args = (void *) grunnable; args = (void *) grunnable;
} }

2
src/java/mraajava.i
View File

@@ -71,7 +71,7 @@ class Spi;
/* initialize mraa */ /* initialize mraa */
globVM = vm; globVM = vm;
mraa_init(); mraa_init();
return JNI_VERSION_1_8; return JNI_VERSION_1_6;
} }
%} %}