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

Fix Android export with multiple architectures failing when GDExtension includes native dependencies
This commit is contained in:
Rémi Verschelde
2026-01-03 00:26:33 +01:00
committed by GitHub

View File

@@ -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);
}