From 97d13822a6b55b5b1418df892811b5795f6ee5c3 Mon Sep 17 00:00:00 2001 From: Woongsuk Cho Date: Wed, 11 Jul 2018 10:35:15 +0900 Subject: [PATCH] bug-fix : support plugin path for tpa Change-Id: I98c0f768dcc6d135cdbc6bc2b3e9682d78cbd933 --- NativeLauncher/util/path_manager.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/NativeLauncher/util/path_manager.cc b/NativeLauncher/util/path_manager.cc index cc42e88..99446ed 100644 --- a/NativeLauncher/util/path_manager.cc +++ b/NativeLauncher/util/path_manager.cc @@ -75,11 +75,9 @@ int initializePathManager(const std::string& runtimeDir, const std::string& tize if (!extraDir.empty()) { splitPath(extraDir, __dllPath->extra_dirs); } else { - if (pluginGetDllPath()) { - std::string pluginPath(pluginGetDllPath()); - if (!pluginPath.empty()) { - splitPath(pluginPath, __dllPath->extra_dirs); - } + char* extraPath = pluginGetDllPath(); + if (extraPath) { + splitPath(extraPath, __dllPath->extra_dirs); } } @@ -129,7 +127,7 @@ std::string getTPA() tpaDir.push_back(getRuntimeDir()); tpaDir.push_back(getTizenFXDir()); tpaDir.push_back(getTizenFXRefDir()); - tpaDir.insert(tpaDir.end(), getExtraDirs().begin(), getExtraDirs().end()); + tpaDir.insert(tpaDir.end(), __dllPath->extra_dirs.begin(), __dllPath->extra_dirs.end()); assembliesInDirectory(tpaDir, __tpa); return __tpa; -- 2.7.4