diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-26 17:23:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 17:23:11 +0100 |
| commit | 5f1107aa30295e686be6f41cb6d17fc2cff1e036 (patch) | |
| tree | 7bce4c680e6686c9d29be8b479be5b39205ce7a3 /platform/android/java_godot_lib_jni.cpp | |
| parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) | |
| parent | be07f86f85ab70a48b310b42faa64e72a74ca694 (diff) | |
| download | redot-engine-5f1107aa30295e686be6f41cb6d17fc2cff1e036.tar.gz | |
Merge pull request #37317 from akien-mga/display-server-rebased
Separate DisplayServer from OS and add multiple windows support
Diffstat (limited to 'platform/android/java_godot_lib_jni.cpp')
| -rw-r--r-- | platform/android/java_godot_lib_jni.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index 8bbf41d82d..e018ee69f0 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "java_godot_lib_jni.h" + #include "java_godot_io_wrapper.h" #include "java_godot_wrapper.h" @@ -37,17 +38,18 @@ #include "api/java_class_wrapper.h" #include "audio_driver_jandroid.h" #include "core/engine.h" +#include "core/input/input_filter.h" #include "core/project_settings.h" #include "dir_access_jandroid.h" #include "file_access_android.h" #include "file_access_jandroid.h" #include "jni_utils.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" + #include <unistd.h> static JavaClassWrapper *java_class_wrapper = NULL; |