Merge "find dlls in the app directory first for app NI" into tizensubmit/tizen/20170320.013057accepted/tizen/unified/20170320.065026accepted/tizen/tv/20170320.064953accepted/tizen/mobile/20170320.064937accepted/tizen/ivi/20170320.065013accepted/tizen/common/20170320.173522accepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_common

1 files changed, 20 insertions, 4 deletions

diff --git a/NativeLauncher/installer-plugin/common.cc b/NativeLauncher/installer-plugin/common.cc
index ddeabdc..5d1306c 100644
--- a/NativeLauncher/installer-plugin/common.cc
+++ b/NativeLauncher/installer-plugin/common.cc
@@ -165,9 +165,25 @@ static void crossgen(const char* dll_path, const char* app_path)
   }
   else
   {
-    std::vector<std::string> tpaDir = {
-      RuntimeDir, DeviceAPIDir
-    };
+    // search dlls in the application directory first, to use application dlls
+    // instead of system dlls when proceeding NI
+    std::vector<std::string> tpaDir;
+    if (app_path != NULL)
+    {
+      std::string path(app_path);
+      std::string::size_type prev_pos = 0, pos = 0;
+      while((pos = path.find(':', pos)) != std::string::npos)
+      {
+        std::string substring(path.substr(prev_pos, pos - prev_pos));
+        tpaDir.push_back(substring);
+        prev_pos = ++pos;
+      }
+      std::string substring(path.substr(prev_pos, pos - prev_pos));
+      tpaDir.push_back(substring);
+    }
+    tpaDir.push_back(RuntimeDir);
+    tpaDir.push_back(DeviceAPIDir);
+
     std::string tpa;
     AssembliesInDirectory(tpaDir, tpa);
 
@@ -273,7 +289,7 @@ void create_ni_under_dirs(const char* root_paths[], int count, const char* ignor
   if (app_paths.back() == ':')
     app_paths.pop_back();
 
-  auto convert = [&app_paths, ignores, igcount, &cb](const char* path)
+  auto convert = [&app_paths, ignores, igcount, &cb](const char* path, const char* name)
   {
     for (int i=0; i<igcount; i++)
     {