From 63c46875376031141e6e9bda694dcb5d59fb8d4b Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Fri, 30 Apr 2021 14:18:52 +0100 Subject: android: Split HAL to its own shared library The libcamera Android HAL implementation should not be an integral part of libcamera, but a support library that utilises the libcamera public API. Move the implementation to its own distinct library. Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda Reviewed-by: Umang Jain Reviewed-by: Paul Elder Signed-off-by: Kieran Bingham --- src/libcamera/meson.build | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/libcamera/meson.build') diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 7e19a177..d9b5bfae 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -130,16 +130,6 @@ libcamera_deps = [ dependency('threads'), ] -libcamera_link_with = [] - -if android_enabled - libcamera_sources += android_hal_sources - includes += android_includes - libcamera_link_with += android_camera_metadata - - libcamera_deps += android_deps -endif - # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag. # The build_rpath is stripped at install time by meson, so we determine at # runtime if the library is running from an installed location by checking @@ -148,10 +138,7 @@ endif libcamera = shared_library('camera', libcamera_sources, install : true, - link_with : libcamera_link_with, - cpp_args : libcamera_cpp_args, include_directories : includes, - objects : libcamera_objects, build_rpath : '/', dependencies : libcamera_deps) -- cgit v1.2.1