Merge "Add option to enable clang Asan build." into tizen

diff --git a/NativeLauncher/dotnet.debugger b/NativeLauncher/dotnet.debugger
index 6f57cde..7a89927 100644 (file)
--- a/NativeLauncher/dotnet.debugger
+++ b/NativeLauncher/dotnet.debugger
@@ -4,3 +4,4 @@ EXE /home/owner/share/tmp/sdk_tools/lldb/bin/lldb-server
 APP_TYPE dotnet
 EXTRA_KEY __DLP_DEBUG_ARG__
 EXTRA_ENV CORECLR_GDBJIT
+EXTRA_ENV COMPlus_ZapDisable

diff --git a/NativeLauncher/inc/log.h b/NativeLauncher/inc/log.h
index 5769204..3315f8e 100644 (file)
--- a/NativeLauncher/inc/log.h
+++ b/NativeLauncher/inc/log.h
@@ -19,11 +19,17 @@
 
 #ifndef NO_TIZEN
 #include <dlog.h>
+#define LOGX(fmt, arg...) \
+       ({ do { \
+               dlog_print(DLOG_ERROR, LOG_TAG, fmt, ##arg); \
+       } while (0); })
+
 #else
 #include <stdio.h>
 #define LOGE(fmt, args...) printf(fmt, ##args)
 #define LOGD(fmt, args...) printf(fmt, ##args)
 #define LOGI(fmt, args...) printf(fmt, ##args)
+#define LOGX(fmt, args...) printf(fmt, ##args)
 #endif
 
 #ifdef  LOG_TAG
@@ -43,4 +49,8 @@
 #define _INFO(fmt, args...) LOGI(fmt "\n", ##args)
 #endif
 
+#ifndef _ERRX
+#define _ERRX(fmt, args...) LOGX(fmt "\n", ##args)
+#endif
+
 #endif /* __LOG_H__ */

diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
index f19e5af..36df3ca 100644 (file)
--- a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
+++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
@@ -344,15 +344,6 @@ int CoreRuntime::launch(const char* appId, const char* root, const char* path, i
 
        bool success = false;
        if (launchFunction != nullptr) {
-               std::string cppPath(path);
-
-               if (isManagedAssembly(cppPath) && !isNativeImage(cppPath)) {
-                       size_t extindex = cppPath.size() - 4;
-                       cppPath = cppPath.substr(0, extindex) + ".ni" + cppPath.substr(extindex, 4);
-                       if (!fileNotExist(cppPath))
-                               path = cppPath.c_str();
-               }
-
                success = launchFunction(root, path, argc, argv);
                if (!success)
                        _ERR("Failed to launch Application %s", path);

diff --git a/NativeLauncher/util/utils.cc b/NativeLauncher/util/utils.cc
index d4142eb..f5b9406 100644 (file)
--- a/NativeLauncher/util/utils.cc
+++ b/NativeLauncher/util/utils.cc
@@ -311,7 +311,7 @@ static void *stdlog(void*)
 
         buf[readSize] = 0;
 
-        _INFO("%s", buf);
+        _ERRX("%s", buf);
     }
 
     return 0;

diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec
index 66bb45d..5f233e8 100644 (file)
--- a/packaging/dotnet-launcher.spec
+++ b/packaging/dotnet-launcher.spec
@@ -120,4 +120,5 @@ ln -sf %{_libdir}/libsqlite3.so.0 %{buildroot}%{_native_lib_dir}/libsqlite3.so
 %if %{use_managed_launcher}
 %{_bindir}/Tizen.Runtime.dll
 %endif
-%caps(cap_sys_admin,cap_setgid=ei) %{_bindir}/dotnet-launcher
+%{_bindir}/dotnet-launcher
+