{"id":12138,"url":"https://patchwork.libcamera.org/api/patches/12138/?format=json","web_url":"https://patchwork.libcamera.org/patch/12138/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210430150219.299389-1-kieran.bingham@ideasonboard.com>","date":"2021-04-30T15:02:19","name":"[libcamera-devel] android: Split HAL to it's own shared library","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"edba4946e9579cfd0432ec60ea67db83b336ea2a","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/12138/mbox/","series":[{"id":1989,"url":"https://patchwork.libcamera.org/api/series/1989/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1989","date":"2021-04-30T15:02:19","name":"[libcamera-devel] android: Split HAL to it's own shared library","version":1,"mbox":"https://patchwork.libcamera.org/series/1989/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12138/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12138/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CA46CBDE4C\n\tfor ;\n\tFri, 30 Apr 2021 15:02:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 339C268901;\n\tFri, 30 Apr 2021 17:02:24 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DF7E7688A5\n\tfor ;\n\tFri, 30 Apr 2021 17:02:22 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5EF1512C4;\n\tFri, 30 Apr 2021 17:02:22 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"T6InYIeK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619794942;\n\tbh=2WystHZ7zKTwQnFZcmwwLzmzIwIU2asgyLxgukOaJfQ=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=T6InYIeKcrqluRY6yEvAQETDgs/gmZ0DMC6jxqRZgeAZfxpOAAP4nCnvpreaMaqpE\n\tcVqqxeg8MPAxJcHzvl8KSB3T3vCjkn1OXt3wOwdY4LmVIO6rxw6Mqjw2OSNTYRWimh\n\tF0yXaHFxX7XD/uYXyo6oRmENhuhlLwa6sQTY7stc=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 30 Apr 2021 16:02:19 +0100","Message-Id":"<20210430150219.299389-1-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] android: Split HAL to it's own shared\n\tlibrary","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The libcamera Android HAL implementation should not be an integral part\nof libcamera, but a support library that utilises the libcamera public\nAPI.\n\nMove the implementation to it's own distinct library.\n\nSigned-off-by: Kieran Bingham \n---\n\nPlease note that this no longer requires ChromeOS to manually symlink\ninto the camera_hal directory.\n\nA modification similar to the following should be applied to the Chrome\nebuilds if this is applied:","diff":"diff --git a/media-libs/libcamera/libcamera-9999.ebuild b/media-libs/libcamera/libcamera-9999.ebuild\nindex 433357f1ef74..cf90e438cfb3 100644\n--- a/media-libs/libcamera/libcamera-9999.ebuild\n+++ b/media-libs/libcamera/libcamera-9999.ebuild\n@@ -57,6 +57,4 @@ src_compile() {\n \n src_install() {\n meson_src_install\n-\n- dosym ../libcamera.so \"/usr/$(get_libdir)/camera_hal/libcamera.so\"\n }\n\n\n src/android/meson.build | 10 ++++++++++\n src/libcamera/meson.build | 11 -----------\n src/meson.build | 7 +++----\n 3 files changed, 13 insertions(+), 15 deletions(-)\n\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex 2be20c97e118..6170448a73ce 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -3,6 +3,7 @@\n android_deps = [\n dependency('libexif', required : get_option('android')),\n dependency('libjpeg', required : get_option('android')),\n+ libcamera_dep,\n ]\n \n android_enabled = true\n@@ -66,3 +67,12 @@ android_camera_metadata = static_library('camera_metadata',\n android_camera_metadata_sources,\n c_args : '-Wno-shadow',\n include_directories : android_includes)\n+\n+android_hal = shared_library('android-hal',\n+ android_hal_sources,\n+ name_prefix : '',\n+ link_with : android_camera_metadata,\n+ install : true,\n+ cpp_args : libcamera_cpp_args,\n+ include_directories : android_includes,\n+ dependencies : android_deps)\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex e0a48aa23ea5..f77b80b878d8 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -129,16 +129,6 @@ libcamera_deps = [\n dependency('threads'),\n ]\n \n-libcamera_link_with = []\n-\n-if android_enabled\n- libcamera_sources += android_hal_sources\n- includes += android_includes\n- libcamera_link_with += android_camera_metadata\n-\n- libcamera_deps += android_deps\n-endif\n-\n # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag.\n # The build_rpath is stripped at install time by meson, so we determine at\n # runtime if the library is running from an installed location by checking\n@@ -147,7 +137,6 @@ endif\n libcamera = shared_library('camera',\n libcamera_sources,\n install : true,\n- link_with : libcamera_link_with,\n cpp_args : libcamera_cpp_args,\n include_directories : includes,\n objects : libcamera_objects,\ndiff --git a/src/meson.build b/src/meson.build\nindex 64d22b9ce5b6..9dc32751bbb1 100644\n--- a/src/meson.build\n+++ b/src/meson.build\n@@ -31,11 +31,10 @@ endif\n libcamera_cpp_args = []\n libcamera_objects = []\n \n-# The 'android' subdir must be processed first, and the build targets\n-# are included directly into the libcamera library when this is enabled.\n-subdir('android')\n-\n+# libcamera must be built first as a dependency to the other components.\n subdir('libcamera')\n+\n+subdir('android')\n subdir('ipa')\n \n subdir('lc-compliance')\n","prefixes":["libcamera-devel"]}