add getRuntimeDir() output to nativeLibPath
authorYaroslav Yamshchikov <y.yamshchiko@samsung.com>
Tue, 2 Jul 2019 12:45:02 +0000 (15:45 +0300)
committerYaroslav Yamshchikov <y.yamshchiko@samsung.com>
Thu, 4 Jul 2019 18:22:16 +0000 (21:22 +0300)
This directory contains .so's coreCLR is looking for and can not find
elsewhere. We think there should be this path.

NativeLauncher/launcher/dotnet/dotnet_launcher.cc

index dff9d57..38ebe27 100644 (file)
@@ -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())) {