From f4daa3fc2a4a952d326470f166bbb5afd3f8948a Mon Sep 17 00:00:00 2001 From: JongHeon Choi Date: Mon, 17 Apr 2017 16:49:55 +0900 Subject: [PATCH] Use application dll to tpa Change-Id: I28c09d0e7ffa12f26c5bab0e4f0eba37ccfa9ef0 --- NativeLauncher/launcher/dotnet/dotnet_launcher.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc index 5f40771..ef42921 100644 --- a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc +++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc @@ -280,22 +280,23 @@ int CoreRuntime::Launch(const char* app_id, const char* root, const char* path, return 1; } - std::vector searchDirectories = { - RuntimeDirectory, DeviceAPIDirectory -#ifdef USE_MANAGED_LAUNCHER - , Basename(LauncherAssembly) -#endif - }; - - //std::string trusted_directories = JoinStrings(searchDirectories, ":"); std::string tpa; - AssembliesInDirectory(searchDirectories, tpa); - std::string appRoot = root; std::string appBin = ConcatPath(appRoot, "bin"); std::string appLib = ConcatPath(appRoot, "lib"); std::string probePath = appBin + ":" + appLib + ":" + NativeLibDirectory; + std::vector searchDirectories; + searchDirectories.push_back(appBin); + searchDirectories.push_back(appLib); + searchDirectories.push_back(RuntimeDirectory); + searchDirectories.push_back(DeviceAPIDirectory); +#ifdef USE_MANAGED_LAUNCHER + searchDirectories.push_back(LauncherAssembly); +#endif + + AssembliesInDirectory(searchDirectories, tpa); + #ifdef USE_MANAGED_LAUNCHER RunManagedLauncher(app_id, probePath.c_str(), tpa.c_str()); -- 2.7.4