diff options
| author | Kostadin Damyanov | 2015-09-05 12:03:17 +0300 |
|---|---|---|
| committer | Kostadin Damyanov | 2015-09-05 12:03:17 +0300 |
| commit | c5f574b914b3cb11d97ae616df4a0bced45bb17c (patch) | |
| tree | d7b70f0842c00c480ce10039b873a1dddd894a6c /platform/android/os_android.cpp | |
| parent | 2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1 (diff) | |
| parent | b0aa49accbd7e45dae38f1bd43b0fbdd11714211 (diff) | |
| download | godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.tar.gz godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.tar.zst godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/android/os_android.cpp')
| -rw-r--r-- | platform/android/os_android.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 612148418..e2ff128f0 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -37,6 +37,8 @@ #include "servers/visual/visual_server_wrap_mt.h" #include "main/main.h" +#include "file_access_android.h" + #include "core/globals.h" #ifdef ANDROID_NATIVE_ACTIVITY @@ -89,8 +91,14 @@ void OS_Android::initialize_core() { if (use_apk_expansion) FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_RESOURCES); - else + else { +#ifdef USE_JAVA_FILE_ACCESS FileAccess::make_default<FileAccessBufferedFA<FileAccessJAndroid> >(FileAccess::ACCESS_RESOURCES); +#else + //FileAccess::make_default<FileAccessBufferedFA<FileAccessAndroid> >(FileAccess::ACCESS_RESOURCES); + FileAccess::make_default<FileAccessAndroid>(FileAccess::ACCESS_RESOURCES); +#endif + } FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_USERDATA); FileAccess::make_default<FileAccessUnix>(FileAccess::ACCESS_FILESYSTEM); //FileAccessBufferedFA<FileAccessUnix>::make_default(); |