[libcamera-devel] [PATCH v2] src: android: Rectify internal header's #include path

[Kieran Bingham]

Hi Umang,

On 29/04/2021 13:22, Umang Jain wrote:
> libcamera internal headers are not installed system-wide. Hence, any
> inclusion of internal headers should be follow the #include directive
> form:
> 	#include "libcamera/internal/header.h"
> 
> This was not the case for a few of the class in android HAL. Fix them
> 

Good spot.

> Signed-off-by: Umang Jain <umang.jain at ideasonboard.com>

For this,

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

There is one more occurrence though in test/bayer-format.cpp as shown by:
 git grep "<libcamera/internal"

Do you think this should be fixed in this patch (in which case, the
title needs a small update, purely to remove the 'android:' or as a
separate patch?

Either way is fine with me.


> ---
> Changes in v2:
> - Also include other classes namely, generic_camera_buffer,
>   post_processor as spotted by Niklas.
> ---
>  src/android/camera_stream.h              | 2 +-
>  src/android/mm/generic_camera_buffer.cpp | 2 +-
>  src/android/post_processor.h             | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
> index f68fdd3a..34016722 100644
> --- a/src/android/camera_stream.h
> +++ b/src/android/camera_stream.h
> @@ -19,7 +19,7 @@
>  #include <libcamera/geometry.h>
>  #include <libcamera/pixel_format.h>
>  
> -#include <libcamera/internal/buffer.h>
> +#include "libcamera/internal/buffer.h"
>  
>  class CameraDevice;
>  class CameraMetadata;
> diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp
> index 929e078a..334498c1 100644
> --- a/src/android/mm/generic_camera_buffer.cpp
> +++ b/src/android/mm/generic_camera_buffer.cpp
> @@ -7,7 +7,7 @@
>  
>  #include "../camera_buffer.h"
>  
> -#include <libcamera/internal/buffer.h>
> +#include "libcamera/internal/buffer.h"
>  #include "libcamera/internal/log.h"
>  
>  using namespace libcamera;
> diff --git a/src/android/post_processor.h b/src/android/post_processor.h
> index 4944078b..547fda37 100644
> --- a/src/android/post_processor.h
> +++ b/src/android/post_processor.h
> @@ -10,7 +10,7 @@
>  #include <libcamera/buffer.h>
>  #include <libcamera/stream.h>
>  
> -#include <libcamera/internal/buffer.h>
> +#include "libcamera/internal/buffer.h"
>  
>  #include "camera_buffer.h"
>  
> 

-- 
Regards
--
Kieran