godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Revert "Enable the ability to use Godot as a subview within an Android app"

Browse Source 
This reverts commit 920639511d.

The changes are good, this revert is only done for release management reasons
as we want this feature to get more testing before making it in a stable build,
but a 3.2.3 release is imminent to handle some regressions in 3.2.2.

This will be re-committed in a 3.2-based feature branch, and we'll merge it
again once we're confident about it (probably for 3.2.4).
This commit is contained in:
Rémi Verschelde
2020-07-10 08:25:01 +02:00
parent 5854bf4696
commit 0246a1a276
16 changed files with 226 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/android/java_godot_wrapper.h
View File

@@ -43,9 +43,7 @@
class GodotJavaWrapper {
private:
jobject godot_instance;
jobject activity;
jclass godot_class;
jclass activity_class;
jclass cls;
jmethodID _on_video_init = 0;
jmethodID _restart = 0;
@@ -64,10 +62,9 @@ private:
jmethodID _vibrate = 0;
jmethodID _get_input_fallback_mapping = 0;
jmethodID _on_godot_main_loop_started = 0;
jmethodID _get_class_loader = 0;
public:
GodotJavaWrapper(JNIEnv *p_env, jobject p_activity, jobject p_godot_instance);
GodotJavaWrapper(JNIEnv *p_env, jobject p_godot_instance);
~GodotJavaWrapper();
jobject get_activity();