From patchwork Mon Oct 24 05:55:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne via libcamera-devel X-Patchwork-Id: 17680 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 0FED0C3285 for ; Mon, 24 Oct 2022 05:55:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AB74462F00; Mon, 24 Oct 2022 07:55:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666590958; bh=ttc2WUU+qWMQtvv8fyyaS8hnpNsn8cRPU3hPTKqBV+M=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=qGE9bKulMvxm7qz2qs6umLPcCMw/vunRtXbAyS9eos4Sw/T+rXKVEEq1EuJ5NZHrr wNPGB5fkAktsZlUHbGAu3ZMGdzTTL/w7n9Y0Q8VYGelQgP5s6ku3dvQE/7qcE9TiE3 XlMS2Da/CrZmrCAkCUHnOfCjL7r9feVSVgTuMxD4XhYf4WZvl8E7g0IEwSkr1wZuWy 8Gwbp+b4CzgDZ6bRD/eKcGTwYquwrpQ6aeTmCmsd0kXdgbpS9WtBoUnCXT27bcgMmn pfW2eGinN+7rHFYV+1rV7gXqx82HXU/gcAyVP9kg08wVYp+JJMTmvMnRnmiaGfPxAm bcY8zYboJJFfQ== Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9AD2362EF8 for ; Mon, 24 Oct 2022 07:55:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=rothemail-net.20210112.gappssmtp.com header.i=@rothemail-net.20210112.gappssmtp.com header.b="5uKI8BaE"; dkim-atps=neutral Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-132fb4fd495so10735627fac.12 for ; Sun, 23 Oct 2022 22:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothemail-net.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=52KQAlg+dJJpg0sPJRNZtOs43oa4UM3f4Tmy/yyvJu8=; b=5uKI8BaExIEZAxAcIkIhW46RNqgyYsOkXefUEYGLj9Mt7zEzD2iETbLDmgHNsaL61S r9Y0VQzbVsuBYAKLcf8ifIXMochRXBfRQ8iTjxh9/jVBKGSxNxLWqEsXSlP461WT5g7H WBFZsP2NN64fJZH4cAhpQYP1NYGKF7lW1i20QPTj35F9y1G/8RNR59arYLSHgJfy8vbv QSfOVkbMaHwwwW+WLNI2HV2xf2iaPndDewxk9nKjDCP7cPbYQhub/4yfGcEy7W7F1n5H RYfrQG/4yXjK7ETH/lC23Lo90EdAUreig7YyYP25M0MSpw+fciXru/ox4/W3PYf9nkbN 05LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=52KQAlg+dJJpg0sPJRNZtOs43oa4UM3f4Tmy/yyvJu8=; b=x5HAIxy+7UGUlehSzP2DOWMUR3/dUTQoHF3avhTJK5ErBcktEHeLQag2n+/rc6nuWH A+AQ/19140z5YVSoTis3/NuzOFux6W/apV1q2VpvEA7J3b9sBhcReEGC07o0J+K6PR6b NSDTlLxXbIAiS7hHwuZetx/8mRHSSbk43p/bmH5UCwNqs5n+oYW0xrKDA5WJt8F5FEH0 2KIhEtEH7FAHxZNzyBmwXzKbCWv9rrJhMqCPuCE9aNob1f0rvvpgMvlriFyCQO818ONn il6U+A9q4fWwcdy7smkCbhIMtEUXDE00mAaKU+I1nuSG1m2pI+VxwU2MbrGQff7s00tA P15g== X-Gm-Message-State: ACrzQf2j/WmXHewzNbzDNLwaSURC5bf8cLJ2EGosGFmn77fl30Iyszuv xcZkaVEEtUGvDnXuzpEBcvom6k5L0g24I8Ya X-Google-Smtp-Source: AMsMyM5owKyCXnwZ8f6+kcek8TmMhklpuyjJdvnoEK9/FSvnDPQl4x97InvkIZyBRVLxygly0oTabw== X-Received: by 2002:a05:6870:b027:b0:136:662d:7cf5 with SMTP id y39-20020a056870b02700b00136662d7cf5mr37171528oae.110.1666590955940; Sun, 23 Oct 2022 22:55:55 -0700 (PDT) Received: from nroth-pc.attlocal.net ([2600:1700:20:20c0:7bc3:aed3:676f:10a0]) by smtp.gmail.com with ESMTPSA id x15-20020a9d628f000000b0066193df8edasm3980278otk.34.2022.10.23.22.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Oct 2022 22:55:55 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 24 Oct 2022 00:55:37 -0500 Message-Id: <20221024055543.116040-6-nicholas@rothemail.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221024055543.116040-1-nicholas@rothemail.net> References: <20221024055543.116040-1-nicholas@rothemail.net> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 05/11] Removes references to std::filesystem, which Android 11's toolchain does not support. X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Nicholas Roth via libcamera-devel From: Nicolas Dufresne via libcamera-devel Reply-To: libcamera-devel@lists.libcamera.org Cc: nicholas@rothemail.net Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Nicholas Roth --- src/android/camera_hal_config.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp index bacfe4b9..c06c993d 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 #include #include @@ -160,13 +159,7 @@ CameraHalConfig::CameraHalConfig() */ int CameraHalConfig::parseConfigurationFile() { - std::filesystem::path filePath = LIBCAMERA_SYSCONF_DIR; - filePath /= "camera_hal.yaml"; - if (!std::filesystem::is_regular_file(filePath)) { - LOG(HALConfig, Debug) - << "Configuration file: \"" << filePath << "\" not found"; - return -ENOENT; - } + std::string filePath = LIBCAMERA_SYSCONF_DIR "/camera_hal.yaml"; File file(filePath); if (!file.open(File::OpenModeFlag::ReadOnly)) {