mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-17 22:43:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[.NET] Fix gradle builds for multiple ABIs

Browse Source 
Include the needed .NET jar in the Godot templates so it's always available, then we don't need to include the jar from a .NET publish which could fail when exporting to multiple architectures because it would attempt to add the same jar for each architecture.
This commit is contained in:
Raul Santos 2024-12-13 08:01:13 +01:00
parent ba2c5c1e61
commit d526d523b4
No known key found for this signature in database
GPG Key ID: B532473AE3A803E4
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
View File

@ -323,7 +323,17 @@ namespace GodotTools.Export
{
if (platform == OS.Platforms.Android)
{
if (IsSharedObject(Path.GetFileName(path)))
string fileName = Path.GetFileName(path);
if (fileName.EndsWith(".jar"))
{
// We exclude jar files from the export since they should
// already be included in the Godot templates, adding them
// again would cause conflicts.
return;
}
if (IsSharedObject(fileName))
{
AddSharedObject(path, tags: new string[] { arch },
Path.Join(projectDataDirName,
@ -336,7 +346,7 @@ namespace GodotTools.Export
static bool IsSharedObject(string fileName)
{
if (fileName.EndsWith(".so") || fileName.EndsWith(".a")
|| fileName.EndsWith(".jar") || fileName.EndsWith(".dex"))
|| fileName.EndsWith(".dex"))
{
return true;
}

5
platform/android/java/app/build.gradle
View File

@ -70,10 +70,7 @@ dependencies {
}
// .NET dependencies
String jar = '../../../../modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar'
if (file(jar).exists()) {
monoImplementation files(jar)
}
monoImplementation fileTree(dir: 'monoLibs', include: ['*.jar'])
}
android {

0
modules/mono/thirdparty/libSystem.Security.Cryptography.Native.Android.jar → platform/android/java/app/monoLibs/libSystem.Security.Cryptography.Native.Android.jar
View File