summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCho Woong Suk <ws77.cho@samsung.com>2016-12-08 22:08:59 +0900
committerJongHeon Choi <j-h.choi@samsung.com>2016-12-14 17:08:50 +0900
commit41189edf30c5be8a7db7930111d268cc31f7345f (patch)
tree1681555cf7608c30fd1355dcfcbfbc6f57163699
parent7831908665a20bc904217edfbdbb7e40343ff2bd (diff)
downloadlauncher-41189edf30c5be8a7db7930111d268cc31f7345f.tar.gz
launcher-41189edf30c5be8a7db7930111d268cc31f7345f.tar.bz2
launcher-41189edf30c5be8a7db7930111d268cc31f7345f.zip
bug-fix : load app ni dll file
Change-Id: Iaf03cfb5893bf5ace992c48cbc96756dbdf3f814
-rwxr-xr-x[-rw-r--r--]Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs b/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs
index 693877f..cbb0095 100644..100755
--- a/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs
+++ b/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyLoader.cs
@@ -68,7 +68,13 @@ namespace Tizen.Runtime.Coreclr
{
foreach (string dir in DllDirectories)
{
- FileInfo f = new FileInfo(Path.Combine(dir, $"{assemblyName.Name}.dll"));
+ FileInfo f = new FileInfo(Path.Combine(dir, $"{assemblyName.Name}.ni.dll"));
+ if (File.Exists(f.FullName))
+ {
+ asm = LoadFromNativeImagePath(f.FullName, null);
+ break;
+ }
+ f = new FileInfo(Path.Combine(dir, $"{assemblyName.Name}.dll"));
if (File.Exists(f.FullName))
{
asm = LoadFromAssemblyPath(f.FullName);