diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-09 11:59:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 11:59:28 +0100 |
| commit | deba274ad18577525a92c7bed636925ca891fc0c (patch) | |
| tree | f5e4478521a314480afbf0d7d50378ddfaf34778 /platform/android/java_godot_lib_jni.cpp | |
| parent | 92c001ef0982dc42de3a0dca1df5ac234cbbe229 (diff) | |
| parent | 09a9712a6ad8bbf7c2b34c6416bc98919f2869ca (diff) | |
Merge pull request #44215 from Faless/fix/fa_buffered_remove_android
Remove unused FileAccessJAndroid.
Diffstat (limited to 'platform/android/java_godot_lib_jni.cpp')
| -rw-r--r-- | platform/android/java_godot_lib_jni.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index 03557b9017..48b8171222 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -43,7 +43,6 @@ #include "dir_access_jandroid.h" #include "display_server_android.h" #include "file_access_android.h" -#include "file_access_jandroid.h" #include "jni_utils.h" #include "main/main.h" #include "net_socket_android.h" @@ -89,14 +88,10 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en godot_io_java = new GodotIOJavaWrapper(env, godot_java->get_member_object("io", "Lorg/godotengine/godot/GodotIO;", env)); ThreadAndroid::make_default(jvm); -#ifdef USE_JAVA_FILE_ACCESS - FileAccessJAndroid::setup(godot_io_java->get_instance()); -#else jobject amgr = env->NewGlobalRef(p_asset_manager); FileAccessAndroid::asset_manager = AAssetManager_fromJava(env, amgr); -#endif DirAccessJAndroid::setup(godot_io_java->get_instance()); AudioDriverAndroid::setup(godot_io_java->get_instance()); |