bug-fix : support plugin path for tpasubmit/tizen/20180711.042223accepted/tizen/unified/20180711.234056

Change-Id: I98c0f768dcc6d135cdbc6bc2b3e9682d78cbd933

1 files 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;