1 files changed, 29 insertions, 29 deletions
diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index cac7efaa88..a62f79952c 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -31,7 +31,6 @@
 #ifndef OS_ANDROID_H
 #define OS_ANDROID_H
 
-#include "audio_driver_jandroid.h"
 #include "audio_driver_opensl.h"
 #include "core/os/main_loop.h"
 #include "drivers/unix/os_unix.h"
@@ -48,8 +47,7 @@ private:
 
 	bool use_apk_expansion;
 
-#if defined(OPENGL_ENABLED)
-	bool use_16bits_fbo;
+#if defined(GLES3_ENABLED)
 	const char *gl_extensions;
 #endif
 
@@ -58,8 +56,8 @@ private:
 #endif
 
 	mutable String data_dir_cache;
+	mutable String cache_dir_cache;
 
-	//AudioDriverAndroid audio_driver_android;
 	AudioDriverOpenSL audio_driver_android;
 
 	MainLoop *main_loop;
@@ -68,15 +66,15 @@ private:
 	GodotIOJavaWrapper *godot_io_java;
 
 public:
-	virtual void initialize_core();
-	virtual void initialize();
+	virtual void initialize_core() override;
+	virtual void initialize() override;
 
-	virtual void initialize_joypads();
+	virtual void initialize_joypads() override;
 
-	virtual void set_main_loop(MainLoop *p_main_loop);
-	virtual void delete_main_loop();
+	virtual void set_main_loop(MainLoop *p_main_loop) override;
+	virtual void delete_main_loop() override;
 
-	virtual void finalize();
+	virtual void finalize() override;
 
 	typedef int64_t ProcessID;
 
@@ -84,18 +82,19 @@ public:
 	GodotJavaWrapper *get_godot_java();
 	GodotIOJavaWrapper *get_godot_io_java();
 
-	virtual bool request_permission(const String &p_name);
-	virtual bool request_permissions();
-	virtual Vector<String> get_granted_permissions() const;
+	virtual bool request_permission(const String &p_name) override;
+	virtual bool request_permissions() override;
+	virtual Vector<String> get_granted_permissions() const override;
 
-	virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false);
+	virtual void alert(const String &p_alert, const String &p_title) override;
 
-	virtual String get_name() const;
-	virtual MainLoop *get_main_loop() const;
+	virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false) override;
+
+	virtual String get_name() const override;
+	virtual MainLoop *get_main_loop() const override;
 
 	void main_loop_begin();
 	bool main_loop_iterate();
-	void main_loop_request_go_back();
 	void main_loop_end();
 	void main_loop_focusout();
 	void main_loop_focusin();
@@ -103,25 +102,26 @@ public:
 	void set_display_size(const Size2i &p_size);
 	Size2i get_display_size() const;
 
-	void set_context_is_16_bits(bool p_is_16);
 	void set_opengl_extensions(const char *p_gl_extensions);
 
 	void set_native_window(ANativeWindow *p_native_window);
 	ANativeWindow *get_native_window() const;
 
-	virtual Error shell_open(String p_uri);
-	virtual String get_user_data_dir() const;
-	virtual String get_resource_dir() const;
-	virtual String get_locale() const;
-	virtual String get_model_name() const;
+	virtual Error shell_open(String p_uri) override;
+	virtual String get_user_data_dir() const override;
+	virtual String get_data_path() const override;
+	virtual String get_cache_path() const override;
+	virtual String get_resource_dir() const override;
+	virtual String get_locale() const override;
+	virtual String get_model_name() const override;
 
-	virtual String get_unique_id() const;
+	virtual String get_unique_id() const override;
 
-	virtual String get_system_dir(SystemDir p_dir) const;
+	virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const override;
 
-	void vibrate_handheld(int p_duration_ms);
+	void vibrate_handheld(int p_duration_ms) override;
 
-	virtual bool _check_internal_feature_support(const String &p_feature);
+	virtual bool _check_internal_feature_support(const String &p_feature) override;
 	OS_Android(GodotJavaWrapper *p_godot_java, GodotIOJavaWrapper *p_godot_io_java, bool p_use_apk_expansion);
 	~OS_Android();
 };