Merge pull request #114483 from ej-sanmartin/fix/android-export-multi-arch

akien-mga · web-flow · commit f0aeea26fb9d · 2026-01-03T00:26:33.000+01:00
Fix Android export with multiple architectures failing when GDExtension includes native dependencies
diff --git a/editor/export/gdextension_export_plugin.h b/editor/export/gdextension_export_plugin.h
@@ -151,7 +151,8 @@ void GDExtensionExportPlugin::_export_file(const String &p_path, const String &p
 			}
 		}
 
-		Vector<SharedObject> dependencies_shared_objects = GDExtensionLibraryLoader::find_extension_dependencies(p_path, config, [p_features](String p_feature) { return p_features.has(p_feature); });
+		Vector<SharedObject> dependencies_shared_objects = GDExtensionLibraryLoader::find_extension_dependencies(
+				p_path, config, [features_wo_arch, arch_tag](String p_feature) { return features_wo_arch.has(p_feature) || (p_feature == arch_tag); });
 		for (const SharedObject &shared_object : dependencies_shared_objects) {
 			_add_shared_object(shared_object);
 		}

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,8 @@ void GDExtensionExportPlugin::_export_file(const String &p_path, const String &p`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- Vector<SharedObject> dependencies_shared_objects = GDExtensionLibraryLoader::find_extension_dependencies(p_path, config, [p_features](String p_feature) { return p_features.has(p_feature); });`
	`154`	`+ Vector<SharedObject> dependencies_shared_objects = GDExtensionLibraryLoader::find_extension_dependencies(`
	`155`	`+ p_path, config, [features_wo_arch, arch_tag](String p_feature) { return features_wo_arch.has(p_feature) \|\| (p_feature == arch_tag); });`
`155`	`156`	`for (const SharedObject &shared_object : dependencies_shared_objects) {`
`156`	`157`	`_add_shared_object(shared_object);`
`157`	`158`	`}`