summaryrefslogtreecommitdiffstats
path: root/platform/android/os_android.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-12-09 11:59:28 +0100
committerGitHub <noreply@github.com>2020-12-09 11:59:28 +0100
commitdeba274ad18577525a92c7bed636925ca891fc0c (patch)
treef5e4478521a314480afbf0d7d50378ddfaf34778 /platform/android/os_android.cpp
parent92c001ef0982dc42de3a0dca1df5ac234cbbe229 (diff)
parent09a9712a6ad8bbf7c2b34c6416bc98919f2869ca (diff)
downloadredot-engine-deba274ad18577525a92c7bed636925ca891fc0c.tar.gz
Merge pull request #44215 from Faless/fix/fa_buffered_remove_android
Remove unused FileAccessJAndroid.
Diffstat (limited to 'platform/android/os_android.cpp')
-rw-r--r--platform/android/os_android.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index 8567d0392f..b90fb3ce6e 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -33,12 +33,11 @@
#include "core/config/project_settings.h"
#include "drivers/unix/dir_access_unix.h"
#include "drivers/unix/file_access_unix.h"
-#include "file_access_android.h"
#include "main/main.h"
#include "platform/android/display_server_android.h"
#include "dir_access_jandroid.h"
-#include "file_access_jandroid.h"
+#include "file_access_android.h"
#include "net_socket_android.h"
#include <dlfcn.h>
@@ -61,11 +60,7 @@ void OS_Android::initialize_core() {
if (use_apk_expansion)
FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES);
else {
-#ifdef USE_JAVA_FILE_ACCESS
- FileAccess::make_default<FileAccessJAndroid>(FileAccess::ACCESS_RESOURCES);
-#else
FileAccess::make_default<FileAccessAndroid>(FileAccess::ACCESS_RESOURCES);
-#endif
}
FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_USERDATA);
FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_FILESYSTEM);