Skip to content

Commit 4adc27e

Browse files
committed
Do not cast JavaEnv to void** for AttachCurrentThread on Android
1 parent d4e3e76 commit 4adc27e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

java_strings.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,10 @@ def construct_jenv(self):
457457
res = "JNIEnv *env;\n"
458458
res += "jint get_jenv_res = (*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_6);\n"
459459
res += "if (get_jenv_res == JNI_EDETACHED) {\n"
460-
res += "\tDO_ASSERT((*j_calls->vm)->AttachCurrentThread(j_calls->vm, (void**)&env, NULL) == JNI_OK);\n"
460+
if self.target == Target.ANDROID:
461+
res += "\tDO_ASSERT((*j_calls->vm)->AttachCurrentThread(j_calls->vm, &env, NULL) == JNI_OK);\n"
462+
else:
463+
res += "\tDO_ASSERT((*j_calls->vm)->AttachCurrentThread(j_calls->vm, (void**)&env, NULL) == JNI_OK);\n"
461464
res += "} else {\n"
462465
res += "\tDO_ASSERT(get_jenv_res == JNI_OK);\n"
463466
res += "}\n"

0 commit comments

Comments
 (0)