From b0aa49accbd7e45dae38f1bd43b0fbdd11714211 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Thu, 3 Sep 2015 23:24:55 -0300
Subject: merged some stuff for okam

---
 platform/android/file_access_android.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'platform/android/file_access_android.h')

diff --git a/platform/android/file_access_android.h b/platform/android/file_access_android.h
index f477920ae..506c2c023 100644
--- a/platform/android/file_access_android.h
+++ b/platform/android/file_access_android.h
@@ -29,14 +29,13 @@
 #ifndef FILE_ACCESS_ANDROID_H
 #define FILE_ACCESS_ANDROID_H
 
-#ifdef ANDROID_NATIVE_ACTIVITY
 
 
 #include "os/file_access.h"
 #include <stdio.h>
 #include <android/asset_manager.h>
 #include <android/log.h>
-#include <android_native_app_glue.h>
+//#include <android_native_app_glue.h>
 
 
 class FileAccessAndroid : public FileAccess {
@@ -51,7 +50,7 @@ public:
 
 	static AAssetManager *asset_manager;
 
-	virtual Error open(const String& p_path, int p_mode_flags); ///< open a file
+	virtual Error _open(const String& p_path, int p_mode_flags); ///< open a file
 	virtual void close(); ///< close a file
 	virtual bool is_open() const; ///< true when file is open
 
@@ -71,12 +70,13 @@ public:
 
 	virtual bool file_exists(const String& p_path); ///< return true if a file exists
 
+	virtual uint64_t _get_modified_time(const String& p_file) { return 0; }
 
-	static void make_default();
+	//static void make_default();
 
 	FileAccessAndroid();
 	~FileAccessAndroid();
 };
 
 #endif // FILE_ACCESS_ANDROID_H
-#endif
+
-- 
cgit v1.2.3-70-g09d2