[libcamera-devel] [PATCH v2 2/6] include: android: Add Android headers from Cros

Laurent Pinchart laurent.pinchart at ideasonboard.com
Wed Aug 7 11:05:15 CEST 2019


Hi Jacopo,

Thank you for the patch.

On Tue, Aug 06, 2019 at 09:55:14PM +0200, Jacopo Mondi wrote:
> Copy the Android Camera3 HAL headers from the ChromiumOS build system
> and define a new inclusion directive in the meson build system for them.
> 
> The header files have been copied from:
> https://chromium.googlesource.com/chromiumos/platform2
> at revision 9e65ddd2c496e712f005ada9715decd2ff8e4a03
> and provide:
> 
> 1) Android CameraHAL3 HAL headers in include/android/hardware/
> 2) The Android system headers in include/android/system/
> 3) The Android camera metadata headers in include/android/metadata/
> 
> The original path in the Cros platform2/ repository is, respectively:
> camera/android/header_files/include/hardware
> camera/android/header_files/include/system
> camera/android/libcamera_metadata/include/
> 
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
> ---
>  .../libhardware/include/hardware/camera3.h    | 3093 +++++++++++++++++
>  .../include/hardware/camera_common.h          |  916 +++++
>  .../libhardware/include/hardware/fb.h         |  173 +
>  .../libhardware/include/hardware/gralloc.h    |  384 ++
>  .../libhardware/include/hardware/hardware.h   |  238 ++
>  include/android/meson.build                   |    5 +
>  .../android/metadata/camera_metadata_hidden.h |  100 +
>  .../android/metadata/system/camera_metadata.h |  580 ++++
>  .../metadata/system/camera_metadata_tags.h    | 1005 ++++++
>  .../metadata/system/camera_vendor_tags.h      |  158 +
>  .../android/system/core/include/android/log.h |  144 +
>  .../system/core/include/cutils/compiler.h     |   44 +
>  .../core/include/cutils/native_handle.h       |   69 +
>  .../system/core/include/system/camera.h       |  298 ++
>  .../system/core/include/system/graphics.h     |  763 ++++
>  .../system/core/include/system/window.h       |  954 +++++
>  include/meson.build                           |    1 +
>  17 files changed, 8925 insertions(+)
>  create mode 100644 include/android/hardware/libhardware/include/hardware/camera3.h
>  create mode 100644 include/android/hardware/libhardware/include/hardware/camera_common.h
>  create mode 100644 include/android/hardware/libhardware/include/hardware/fb.h
>  create mode 100644 include/android/hardware/libhardware/include/hardware/gralloc.h
>  create mode 100644 include/android/hardware/libhardware/include/hardware/hardware.h
>  create mode 100644 include/android/meson.build
>  create mode 100644 include/android/metadata/camera_metadata_hidden.h
>  create mode 100644 include/android/metadata/system/camera_metadata.h
>  create mode 100644 include/android/metadata/system/camera_metadata_tags.h
>  create mode 100644 include/android/metadata/system/camera_vendor_tags.h
>  create mode 100644 include/android/system/core/include/android/log.h

I think this file can be dropped.

>  create mode 100644 include/android/system/core/include/cutils/compiler.h
>  create mode 100644 include/android/system/core/include/cutils/native_handle.h
>  create mode 100644 include/android/system/core/include/system/camera.h
>  create mode 100644 include/android/system/core/include/system/graphics.h
>  create mode 100644 include/android/system/core/include/system/window.h

[snip]

> diff --git a/include/android/meson.build b/include/android/meson.build
> new file mode 100644
> index 000000000000..0fe40dabe1d5
> --- /dev/null
> +++ b/include/android/meson.build
> @@ -0,0 +1,5 @@
> +android_includes = ([
> +    include_directories('hardware/libhardware/include/'),
> +    include_directories('system/core/include'),
> +    include_directories('metadata/'),

Maybe sort them alphabetically ?

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> +])

[snip]

-- 
Regards,

Laurent Pinchart


More information about the libcamera-devel mailing list