From 185574b741f0eca6c6225f4dec6be847aa73738f Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Sat, 3 Apr 2021 22:10:12 +0900 Subject: android: Define OS_CHROMEOS macro if android_platform=cros Android Camera HAL 3 API used in ChromeOS has a ChromeOS own extension, for example, crop_rotate_scale_degrees in camera3_stream. As those extensions are not available on Android platforms, introduce a OS_CHROMEOS macro that can be used to compile CrOS-specific code conditionally. The macro is defined if and only if android_platform is 'cros'. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/android/meson.build | 4 ++++ src/libcamera/meson.build | 1 + src/meson.build | 1 + 3 files changed, 6 insertions(+) diff --git a/src/android/meson.build b/src/android/meson.build index 8e7d07d9..2be20c97 100644 --- a/src/android/meson.build +++ b/src/android/meson.build @@ -35,6 +35,10 @@ endif android_deps += [libyuv_dep] +if get_option('android_platform') == 'cros' + libcamera_cpp_args += [ '-DOS_CHROMEOS'] +endif + subdir('cros') android_hal_sources = files([ diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 815629db..e0a48aa2 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -148,6 +148,7 @@ 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 : '/', diff --git a/src/meson.build b/src/meson.build index c908b067..8c1c8763 100644 --- a/src/meson.build +++ b/src/meson.build @@ -11,6 +11,7 @@ else ipa_sign_module = false endif +libcamera_cpp_args = [] libcamera_objects = [] # The 'android' subdir must be processed first, and the build targets -- cgit v1.2.1