diff options
| author | 조웅석/Common Platform Lab(SR)/Principal Engineer/삼성전자 <ws77.cho@samsung.com> | 2019-07-05 13:49:08 +0900 |
|---|---|---|
| committer | GitHub Enterprise <noreply-CODE@samsung.com> | 2019-07-05 13:49:08 +0900 |
| commit | 712e23e8888463e1f22c443e41d303a58ec83bce (patch) | |
| tree | 04a021eecf11f6743e4f351513212abcff4deedd | |
| parent | 0b958c6f069521bba9810c9da7b99e12255e2a97 (diff) | |
| parent | 0798b1c056a9665d4b27dda2e2a68b07a5410354 (diff) | |
| download | launcher-712e23e8888463e1f22c443e41d303a58ec83bce.tar.gz launcher-712e23e8888463e1f22c443e41d303a58ec83bce.tar.bz2 launcher-712e23e8888463e1f22c443e41d303a58ec83bce.zip | |
Merge pull request #77 from y-yamshchiko/iss154
add getRuntimeDir() output to nativeLibPath
| -rw-r--r-- | NativeLauncher/launcher/dotnet/dotnet_launcher.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc index dff9d57..38ebe27 100644 --- a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc +++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc @@ -386,7 +386,8 @@ int CoreRuntime::initialize(bool standalone) std::string probePath = appBin + ":" + appLib + ":" + appTAC; std::string NIprobePath = concatPath(appBin, APP_NI_SUB_DIR) + ":" + concatPath(appLib, APP_NI_SUB_DIR) + ":" + appTAC; std::string tpa = getTPA(); - std::string nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appBin + ":" + appLib + ":" + __nativeLibDirectory; + std::string runtimeDir = getRuntimeDir(); + std::string nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appBin + ":" + appLib + ":" + __nativeLibDirectory + ":" + runtimeDir; std::string appName = std::string("dotnet-launcher-") + std::to_string(getpid()); if (!initializeCoreClr(appName.c_str(), probePath.c_str(), NIprobePath.c_str(), nativeLibPath.c_str(), tpa.c_str())) { |