From 0b4b74382cd403e52b92eefaba2e58579eba6bc4 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Fri, 24 Jul 2020 10:01:28 -0300 Subject: [PATCH] Use a platform agnostic name for native libraries This patch makes the DALi C# binder and tizenfx-stub library names platform agnostic. This guarantees they can be loaded in Windows and Linux environments. --- src/Tizen.Applications.Common/Interop/Interop.Libraries.cs | 4 ++-- .../Interop/Interop.Libraries.cs | 4 ++-- .../Interop/Interop.Libraries.cs | 2 +- src/Tizen.Log/Interop/Interop.Dlog.cs | 2 +- src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs | 2 +- src/Tizen.System.Information/Interop/Interop.Libraries.cs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Tizen.Applications.Common/Interop/Interop.Libraries.cs b/src/Tizen.Applications.Common/Interop/Interop.Libraries.cs index 000e03436b0..a69ff4b31d9 100755 --- a/src/Tizen.Applications.Common/Interop/Interop.Libraries.cs +++ b/src/Tizen.Applications.Common/Interop/Interop.Libraries.cs @@ -18,10 +18,10 @@ internal static partial class Interop { internal static partial class Libraries { - public const string AppCommon = "libcapi-appfw-app-common.so.0"; + public const string AppCommon = "capi-appfw-app-common"; public const string AppControl = "libcapi-appfw-app-control.so.0"; public const string AppEvent = "libcapi-appfw-event.so.0"; - public const string AppManager = "libcapi-appfw-app-manager.so.0"; + public const string AppManager = "capi-appfw-app-manager"; public const string Bundle = "libbundle.so.0"; public const string Rua = "librua.so.0"; public const string Glib = "libglib-2.0.so.0"; diff --git a/src/Tizen.Applications.WatchApplication/Interop/Interop.Libraries.cs b/src/Tizen.Applications.WatchApplication/Interop/Interop.Libraries.cs index 77c0b484e91..6a683757bd4 100755 --- a/src/Tizen.Applications.WatchApplication/Interop/Interop.Libraries.cs +++ b/src/Tizen.Applications.WatchApplication/Interop/Interop.Libraries.cs @@ -18,7 +18,7 @@ internal static partial class Interop { internal static partial class Libraries { - public const string AppCommon = "libcapi-appfw-app-common.so.0"; + public const string AppCommon = "capi-appfw-app-common"; public const string AppCoreWatch = "libappcore-watch.so.1"; } -} \ No newline at end of file +} diff --git a/src/Tizen.Applications.WidgetApplication/Interop/Interop.Libraries.cs b/src/Tizen.Applications.WidgetApplication/Interop/Interop.Libraries.cs index 7b43b3837c2..6c13d8400a0 100755 --- a/src/Tizen.Applications.WidgetApplication/Interop/Interop.Libraries.cs +++ b/src/Tizen.Applications.WidgetApplication/Interop/Interop.Libraries.cs @@ -18,7 +18,7 @@ internal static partial class Interop { internal static partial class Libraries { - public const string AppCommon = "libcapi-appfw-app-common.so.0"; + public const string AppCommon = "capi-appfw-app-common"; public const string AppcoreWidget = "libcapi-appfw-widget-application.so.1"; public const string WidgetService = "libwidget_service.so.1"; } diff --git a/src/Tizen.Log/Interop/Interop.Dlog.cs b/src/Tizen.Log/Interop/Interop.Dlog.cs index db1253556bb..e48a5789c23 100644 --- a/src/Tizen.Log/Interop/Interop.Dlog.cs +++ b/src/Tizen.Log/Interop/Interop.Dlog.cs @@ -20,7 +20,7 @@ internal static partial class Interop { internal static partial class Libraries { - public const string Dlog = "libdlog.so.0"; + public const string Dlog = "dlog"; } internal static partial class Dlog diff --git a/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs index 6c3577ff069..d6e57d9c9be 100755 --- a/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs @@ -20,7 +20,7 @@ namespace Tizen.NUI class NDalicPINVOKE { - public const string Lib = "libdali2-csharp-binder.so"; + public const string Lib = "dali2-csharp-binder"; protected class SWIGExceptionHelper { /// 3 diff --git a/src/Tizen.System.Information/Interop/Interop.Libraries.cs b/src/Tizen.System.Information/Interop/Interop.Libraries.cs index ddb18845f92..7ed86dda46f 100644 --- a/src/Tizen.System.Information/Interop/Interop.Libraries.cs +++ b/src/Tizen.System.Information/Interop/Interop.Libraries.cs @@ -19,6 +19,6 @@ internal static partial class Interop internal static partial class Libraries { internal const string RuntimeInfo = "libcapi-system-runtime-info.so.0"; - internal const string SystemInfo = "libcapi-system-info.so.0"; + internal const string SystemInfo = "capi-system-info"; } }