From: Woongsuk Cho <ws77.cho@samsung.com>
Date: Fri, 12 Apr 2019 01:25:33 +0000 (+0900)
Subject: Bug-fix : plugin extra directory should be added for TPA searching directory.
X-Git-Tag: accepted/tizen/unified/20190412.124729^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26e13de856cdebc732363c002f57cef8eef13c2b;p=platform%2Fcore%2Fdotnet%2Flauncher.git

Bug-fix : plugin extra directory should be added for TPA searching directory.
---

diff --git a/NativeLauncher/util/path_manager.cc b/NativeLauncher/util/path_manager.cc
index 8644bf0..daa8f34 100644
--- a/NativeLauncher/util/path_manager.cc
+++ b/NativeLauncher/util/path_manager.cc
@@ -137,6 +137,22 @@ static std::string getPlatformTPA()
 	return platform_tpa;
 }
 
+static std::string getPluginTPA()
+{
+	std::string plugin_tpa;
+
+	char* plugin_tpa_list = pluginGetTPA();
+	if (plugin_tpa_list) {
+		_INFO("plugin TPA list found. use TPA list for plugin");
+		plugin_tpa = plugin_tpa_list;
+	} else if (!__dllPath->extra_dirs.empty()){
+		_INFO("plugin extra directory found. use plugin extra directroy for TPA");
+		assembliesInDirectory(__dllPath->extra_dirs, plugin_tpa);
+	}
+
+	return plugin_tpa;
+}
+
 std::string getTPA()
 {
 	if (!__tpa.empty()) {
@@ -147,14 +163,6 @@ std::string getTPA()
 		return std::string("");
 	}
 
-	__tpa = getPlatformTPA();
-
-	char* pluginTPA = pluginGetTPA();
-	if (pluginTPA) {
-		_INFO("plugin tpa found.\n");
-		__tpa = __tpa + ":" + pluginTPA;
-	}
-
-	return __tpa;
+	return getPlatformTPA() + ":" + getPluginTPA();
 }