godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Merge pull request #108243 from m4gr3d/fix_android_plugin_init

Browse Source 
Android: Fix Android plugins regression
This commit is contained in:
Thaddeus Crews
2025-07-04 10:09:06 -05:00
parent 8f816614f6 bbf22a39c1
commit eb2625cf57
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/java/lib/src/org/godotengine/godot/Godot.kt
View File

@@ -204,7 +204,7 @@ class Godot private constructor(val context: Context) {
* @throws IllegalArgumentException exception if the specified expansion pack (if any) * @throws IllegalArgumentException exception if the specified expansion pack (if any)
* is invalid. * is invalid.
*/ */
fun initEngine(commandLineParams: List<String>, hostPlugins: Set<GodotPlugin>): Boolean { fun initEngine(host: GodotHost?, commandLineParams: List<String>, hostPlugins: Set<GodotPlugin> = Collections.emptySet()): Boolean {
if (isNativeInitialized()) { if (isNativeInitialized()) {
Log.d(TAG, "Engine already initialized") Log.d(TAG, "Engine already initialized")
return true return true
@@ -216,6 +216,8 @@ class Godot private constructor(val context: Context) {
beginBenchmarkMeasure("Startup", "Godot::initEngine") beginBenchmarkMeasure("Startup", "Godot::initEngine")
try { try {
this.primaryHost = host
Log.v(TAG, "Initializing Godot plugin registry") Log.v(TAG, "Initializing Godot plugin registry")
val runtimePlugins = mutableSetOf<GodotPlugin>(AndroidRuntimePlugin(this)) val runtimePlugins = mutableSetOf<GodotPlugin>(AndroidRuntimePlugin(this))
runtimePlugins.addAll(hostPlugins) runtimePlugins.addAll(hostPlugins)

2
platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java
View File

@@ -174,7 +174,7 @@ public class GodotFragment extends Fragment implements IDownloaderClient, GodotH
private void performEngineInitialization() { private void performEngineInitialization() {
try { try {
if (!godot.initEngine(getCommandLine(), getHostPlugins(godot))) { if (!godot.initEngine(this, getCommandLine(), getHostPlugins(godot))) {
throw new IllegalStateException("Unable to initialize Godot engine"); throw new IllegalStateException("Unable to initialize Godot engine");
} }

2
platform/android/java/lib/src/org/godotengine/godot/service/GodotService.kt
View File

@@ -321,7 +321,7 @@ open class GodotService : Service() {
Log.d(TAG, "Performing engine initialization") Log.d(TAG, "Performing engine initialization")
try { try {
// Initialize the Godot instance // Initialize the Godot instance
if (!godot.initEngine(godotHost.commandLine, godotHost.getHostPlugins(godot))) { if (!godot.initEngine(godotHost, godotHost.commandLine, godotHost.getHostPlugins(godot))) {
throw IllegalStateException("Unable to initialize Godot engine layer") throw IllegalStateException("Unable to initialize Godot engine layer")
} }