NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: remove references to std::filesystem

Browse source 
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>
This commit is contained in:
Nicholas Roth 2022-10-27 22:17:21 -05:00 • committed by Kieran Bingham
parent 88d059105b
commit 6a2f971035
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/android/camera_hal_config.cpp
View file

@ -6,7 +6,6 @@
*/ */
#include "camera_hal_config.h" #include "camera_hal_config.h"
#include <filesystem>
#include <stdlib.h> #include <stdlib.h>
#include <string> #include <string>
@ -160,15 +159,15 @@ CameraHalConfig::CameraHalConfig()
*/ */
int CameraHalConfig::parseConfigurationFile() int CameraHalConfig::parseConfigurationFile()
{ {
std::filesystem::path filePath = LIBCAMERA_SYSCONF_DIR; std::string filePath = LIBCAMERA_SYSCONF_DIR "/camera_hal.yaml";
filePath /= "camera_hal.yaml";
if (!std::filesystem::is_regular_file(filePath)) { File file(filePath);
if (!file.exists()) {
LOG(HALConfig, Debug) LOG(HALConfig, Debug)
<< "Configuration file: \"" << filePath << "\" not found"; << "Configuration file: \"" << filePath << "\" not found";
return -ENOENT; return -ENOENT;
} }
File file(filePath);
if (!file.open(File::OpenModeFlag::ReadOnly)) { if (!file.open(File::OpenModeFlag::ReadOnly)) {
int ret = file.error(); int ret = file.error();
LOG(HALConfig, Error) << "Failed to open configuration file " LOG(HALConfig, Error) << "Failed to open configuration file "