PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: ipa_proxy: rearrange proxies precedence

Browse Source 
User environment path in LIBCAMERA_IPA_PROXY_PATH should take precedence
over system loading locations. Change precedence accordingly

Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kaaira Gupta
2020-03-18 20:54:24 +05:30
committed by Kieran Bingham
parent 6afe116dcc
commit 1eaf7407c2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcamera/ipa_proxy.cpp
View File

@@ -75,13 +75,9 @@ IPAProxy::~IPAProxy()
*/
std::string IPAProxy::resolvePath(const std::string &file) const
{
/* Try finding the exec target from the install directory first */
std::string proxyFile = "/" + file;
std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;
if (!access(proxyPath.c_str(), X_OK))
return proxyPath;
/* No exec target in install directory; check env variable. */
/* Check env variable first. */
const char *execPaths = utils::secure_getenv("LIBCAMERA_IPA_PROXY_PATH");
if (execPaths) {
for (const auto &dir : utils::split(execPaths, ":")) {
@@ -95,6 +91,11 @@ std::string IPAProxy::resolvePath(const std::string &file) const
}
}
/* Try finding the exec target from the install directory. */
std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;
if (!access(proxyPath.c_str(), X_OK))
return proxyPath;
return std::string();
}