summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoungjae Shin <yj99.shin@samsung.com>2017-09-25 16:15:23 +0900
committerwoongsuk cho <ws77.cho@samsung.com>2017-09-26 22:22:27 +0000
commit87aa85f9e4d031707993fa3b3a0d859a3ab4ea6a (patch)
tree3a317890b483ec80e6ae950ebfdfe7cb953f5e51
parent92d452a3b984b07e834f0528e8b3f9a8cd18371f (diff)
downloadlauncher-87aa85f9e4d031707993fa3b3a0d859a3ab4ea6a.tar.gz
launcher-87aa85f9e4d031707993fa3b3a0d859a3ab4ea6a.tar.bz2
launcher-87aa85f9e4d031707993fa3b3a0d859a3ab4ea6a.zip
Change-Id: I67138414a61ba4594920830b4ad95e3f72b62e23 (cherry picked from commit 3f04bea75943d9cb11c1bf861ade7993e0ff74d4)
-rw-r--r--NativeLauncher/installer-plugin/common.cc2
-rw-r--r--Tizen.Runtime/CoreClr/AssemblyManager.cs4
2 files changed, 4 insertions, 2 deletions
diff --git a/NativeLauncher/installer-plugin/common.cc b/NativeLauncher/installer-plugin/common.cc
index 74b6f18..4d5feeb 100644
--- a/NativeLauncher/installer-plugin/common.cc
+++ b/NativeLauncher/installer-plugin/common.cc
@@ -64,6 +64,7 @@ static const char* __JIT_PATH = __STR(RUNTIME_DIR)"/libclrjit.so";
#undef __XSTR
+#if 0
static std::string replace(std::string &str, const std::string& from, const std::string& to)
{
size_t startPos = 0;
@@ -73,6 +74,7 @@ static std::string replace(std::string &str, const std::string& from, const std:
}
return str;
}
+#endif
static void smack_(const char* dllPath, const char* label)
{
diff --git a/Tizen.Runtime/CoreClr/AssemblyManager.cs b/Tizen.Runtime/CoreClr/AssemblyManager.cs
index d8b19f5..60b3e54 100644
--- a/Tizen.Runtime/CoreClr/AssemblyManager.cs
+++ b/Tizen.Runtime/CoreClr/AssemblyManager.cs
@@ -96,8 +96,8 @@ namespace Tizen.Runtime.Coreclr
{
try
{
- /// Set UnhandledException handler with reflection
- /// we must replace this to no reflection method after AppDomain is comming in used net standard
+ // Set UnhandledException handler with reflection
+ // we must replace this to no reflection method after AppDomain is comming in used net standard
TypeInfo appdomainType = Type.GetType("System.AppDomain").GetTypeInfo();
PropertyInfo currentDomain = appdomainType.GetProperty("CurrentDomain",
BindingFlags.Public | BindingFlags.Static);