diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-14 21:53:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-14 21:53:08 +0100 |
| commit | d3a07d3550bd6f56028c03b97a5194dc69a48a0e (patch) | |
| tree | 687005c3d5c7d25b133c5abe3d2007b2a6085030 /platform/android/java_godot_lib_jni.cpp | |
| parent | a5dcabbbfb2a0b9c6688ea0b6f788491f350f5da (diff) | |
| parent | 04c917899f1bfba7fbae8f20b602f726f43102d6 (diff) | |
| download | redot-engine-d3a07d3550bd6f56028c03b97a5194dc69a48a0e.tar.gz | |
Merge pull request #33910 from Faless/net/android_mlock
Acquire MulticastLock on Android when using broadcast/multicast
Diffstat (limited to 'platform/android/java_godot_lib_jni.cpp')
| -rw-r--r-- | platform/android/java_godot_lib_jni.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index a14e0a1960..1ad1fb0afe 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -43,6 +43,7 @@ #include "java_class_wrapper.h" #include "main/input_default.h" #include "main/main.h" +#include "net_socket_android.h" #include "os_android.h" #include "string_android.h" #include "thread_jandroid.h" @@ -635,6 +636,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en DirAccessJAndroid::setup(godot_io_java->get_instance()); AudioDriverAndroid::setup(godot_io_java->get_instance()); + NetSocketAndroid::setup(godot_java->get_member_object("netUtils", "Lorg/godotengine/godot/utils/GodotNetUtils;", env)); os_android = new OS_Android(godot_java, godot_io_java, p_use_apk_expansion); |