summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Roth <nicholas@rothemail.net>2022-10-27 22:17:21 -0500
committerKieran Bingham <kieran.bingham@ideasonboard.com>2022-10-28 11:37:41 +0100
commit6a2f971035c2df711b10200f9c8c011d9a420e58 (patch)
tree8ff1abf06493255f6d25977dc1bff07dc3ce51a8
parent88d059105b611be03d67559aa7fbbab7c45c8ace (diff)
android: remove references to std::filesystem
Android 11's toolchain does not support std::filesystem, but camera_hal_config.cpp currently uses it. Remove references to std::filesystem in order to support Android <= 11. This adds a very small difference in behaviour, as File::exist() will return true for special files (pipes, character or block devices, ...) while std::filesystem::is_regular_file() doesn't, but I consider this to be a corner case that doesn't matter much. Signed-off-by: Nicholas Roth <nicholas@rothemail.net> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/android/camera_hal_config.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp
index bacfe4b9..0e7cde63 100644
--- a/src/android/camera_hal_config.cpp
+++ b/src/android/camera_hal_config.cpp
@@ -6,7 +6,6 @@
*/
#include "camera_hal_config.h"
-#include <filesystem>
#include <stdlib.h>
#include <string>
@@ -160,15 +159,15 @@ CameraHalConfig::CameraHalConfig()
*/
int CameraHalConfig::parseConfigurationFile()
{
- std::filesystem::path filePath = LIBCAMERA_SYSCONF_DIR;
- filePath /= "camera_hal.yaml";
- if (!std::filesystem::is_regular_file(filePath)) {
+ std::string filePath = LIBCAMERA_SYSCONF_DIR "/camera_hal.yaml";
+
+ File file(filePath);
+ if (!file.exists()) {
LOG(HALConfig, Debug)
<< "Configuration file: \"" << filePath << "\" not found";
return -ENOENT;
}
- File file(filePath);
if (!file.open(File::OpenModeFlag::ReadOnly)) {
int ret = file.error();
LOG(HALConfig, Error) << "Failed to open configuration file "