From 1548ce2f61c27ef9e327187d9e28403909403e8a Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Mon, 11 Mar 2024 17:10:34 +0000 Subject: [PATCH] hidl: camera: Update dependencies for U QPR2 Change-Id: I7b2d1b75c7064ce1684c98cde703eca74a8e4cbc --- hidl/camera/default/Android.bp | 5 ++--- hidl/camera/device/3.2/default/Android.bp | 1 + hidl/camera/device/3.4/default/Android.bp | 1 + hidl/camera/device/3.5/default/Android.bp | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hidl/camera/default/Android.bp b/hidl/camera/default/Android.bp index 6d7dcdd9..3a7c2543 100644 --- a/hidl/camera/default/Android.bp +++ b/hidl/camera/default/Android.bp @@ -24,14 +24,13 @@ cc_library_static { "libgralloctypes", "libhardware", "libcamera_metadata", - "android.hardware.graphics.mapper@2.0", - "android.hardware.graphics.mapper@3.0", - "android.hardware.graphics.mapper@4.0", "libexif", + "libui", ], include_dirs: ["system/media/private/camera/include"], header_libs: ["libhardware_headers.camera3_samsung"], export_include_dirs: ["include"], + export_shared_lib_headers: ["libui"], } // NOTE: Deprecated module kept for compatibility reasons. diff --git a/hidl/camera/device/3.2/default/Android.bp b/hidl/camera/device/3.2/default/Android.bp index 14488dd6..a61f429b 100644 --- a/hidl/camera/device/3.2/default/Android.bp +++ b/hidl/camera/device/3.2/default/Android.bp @@ -24,6 +24,7 @@ cc_library_shared { "libhardware", "libcamera_metadata", "libfmq", + "libui", ], static_libs: [ "android.hardware.camera.common@1.0-helper.samsung", diff --git a/hidl/camera/device/3.4/default/Android.bp b/hidl/camera/device/3.4/default/Android.bp index 3941536c..24672d27 100644 --- a/hidl/camera/device/3.4/default/Android.bp +++ b/hidl/camera/device/3.4/default/Android.bp @@ -45,6 +45,7 @@ cc_library_shared { "libhardware", "libcamera_metadata", "libfmq", + "libui", ], static_libs: [ "android.hardware.camera.common@1.0-helper.samsung", diff --git a/hidl/camera/device/3.5/default/Android.bp b/hidl/camera/device/3.5/default/Android.bp index 120f9957..3f65dce3 100644 --- a/hidl/camera/device/3.5/default/Android.bp +++ b/hidl/camera/device/3.5/default/Android.bp @@ -28,6 +28,7 @@ cc_library_shared { ], shared_libs: [ "libhidlbase", + "libui", "libutils", "libcutils", "camera.device@3.2-impl.samsung",