summaryrefslogtreecommitdiffstats
path: root/parameter
diff options
context:
space:
mode:
authorLouis Le Gall <louis.le.gall@intel.com>2014-09-19 11:52:35 +0200
committerMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-10-01 17:08:17 +0200
commitfdcbfb9476ce68a5b899a61775ed9b168c3232a0 (patch)
tree25d3aafe99fdda6df8b177fb79dbd02b903374fc /parameter
parentf811b7b53c0c2f0d4320c70230e609619c5087c1 (diff)
downloadexternal_parameter-framework-fdcbfb9476ce68a5b899a61775ed9b168c3232a0.zip
external_parameter-framework-fdcbfb9476ce68a5b899a61775ed9b168c3232a0.tar.gz
external_parameter-framework-fdcbfb9476ce68a5b899a61775ed9b168c3232a0.tar.bz2
Allow the plugin libraries to have empty path for location
If the xml defines the path of plugin library as empty, as a slash is always added between the folder path and the library name, the parameter framework will look for the library at the root of the file system. This patch prevents from adding the slash except if the path is not empty. Issue: GMINL-1748 Change-Id: I14ed5a5ddbef7e0305300479f4fd44bf611f3442 Signed-off-by: Louis Le Gall <louis.le.gall@intel.com>
Diffstat (limited to 'parameter')
-rw-r--r--parameter/SystemClass.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/parameter/SystemClass.cpp b/parameter/SystemClass.cpp
index 8ab7c94..99ddea9 100644
--- a/parameter/SystemClass.cpp
+++ b/parameter/SystemClass.cpp
@@ -134,8 +134,10 @@ bool CSystemClass::loadSubsystemsFromSharedLibraries(list<string>& lstrError,
// Get Folder for current Plugin Location
const CPluginLocation* pPluginLocation = static_cast<const CPluginLocation*>(pSubsystemPlugins->getChild(uiPluginLocation));
- const string& strFolder = pPluginLocation->getFolder();
-
+ string strFolder(pPluginLocation->getFolder());
+ if (!strFolder.empty()) {
+ strFolder += "/";
+ }
// Iterator on Plugin List:
list<string>::const_iterator it;
@@ -144,7 +146,7 @@ bool CSystemClass::loadSubsystemsFromSharedLibraries(list<string>& lstrError,
for (it = pluginList.begin(); it != pluginList.end(); ++it) {
// Fill Plugin files list
- lstrPluginFiles.push_back(strFolder + "/" + *it);
+ lstrPluginFiles.push_back(strFolder + *it);
}
}