From 84c100e3959437096b52d0210902b822711ff4aa Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Mon, 27 May 2024 21:55:01 +0200 Subject: [PATCH] aidl: camera: Wire up previous camera3.h/camera_common.h modifications * And move related sources to aidl folder since HIDL is deprecated Change-Id: Ia9588f07837c09161bc58b9d2e510c7d6429a4bb --- {hidl/camera/default => aidl/camera/common}/Android.bp | 0 .../default => aidl/camera/common}/CameraMetadata.cpp | 0 .../default => aidl/camera/common}/CameraModule.cpp | 0 .../camera/common}/CameraParameters.cpp | 0 {hidl/camera/default => aidl/camera/common}/Exif.cpp | 0 .../default => aidl/camera/common}/HandleImporter.cpp | 0 .../default => aidl/camera/common}/SimpleThread.cpp | 0 .../camera/common}/VendorTagDescriptor.cpp | 0 aidl/camera/common/include | 1 + aidl/camera/device/Android.bp | 10 ++++++++-- {hidl => aidl}/camera/libhardware_headers/Android.bp | 0 .../libhardware_headers/include/hardware/camera.h | 0 .../libhardware_headers/include/hardware/camera3.h | 0 .../include/hardware/camera_common.h | 0 aidl/camera/provider/Android.bp | 6 +++++- hidl/camera/default/include | 1 - 16 files changed, 14 insertions(+), 4 deletions(-) rename {hidl/camera/default => aidl/camera/common}/Android.bp (100%) rename {hidl/camera/default => aidl/camera/common}/CameraMetadata.cpp (100%) rename {hidl/camera/default => aidl/camera/common}/CameraModule.cpp (100%) rename {hidl/camera/default => aidl/camera/common}/CameraParameters.cpp (100%) rename {hidl/camera/default => aidl/camera/common}/Exif.cpp (100%) rename {hidl/camera/default => aidl/camera/common}/HandleImporter.cpp (100%) rename {hidl/camera/default => aidl/camera/common}/SimpleThread.cpp (100%) rename {hidl/camera/default => aidl/camera/common}/VendorTagDescriptor.cpp (100%) create mode 120000 aidl/camera/common/include rename {hidl => aidl}/camera/libhardware_headers/Android.bp (100%) rename {hidl => aidl}/camera/libhardware_headers/include/hardware/camera.h (100%) rename {hidl => aidl}/camera/libhardware_headers/include/hardware/camera3.h (100%) rename {hidl => aidl}/camera/libhardware_headers/include/hardware/camera_common.h (100%) delete mode 120000 hidl/camera/default/include diff --git a/hidl/camera/default/Android.bp b/aidl/camera/common/Android.bp similarity index 100% rename from hidl/camera/default/Android.bp rename to aidl/camera/common/Android.bp diff --git a/hidl/camera/default/CameraMetadata.cpp b/aidl/camera/common/CameraMetadata.cpp similarity index 100% rename from hidl/camera/default/CameraMetadata.cpp rename to aidl/camera/common/CameraMetadata.cpp diff --git a/hidl/camera/default/CameraModule.cpp b/aidl/camera/common/CameraModule.cpp similarity index 100% rename from hidl/camera/default/CameraModule.cpp rename to aidl/camera/common/CameraModule.cpp diff --git a/hidl/camera/default/CameraParameters.cpp b/aidl/camera/common/CameraParameters.cpp similarity index 100% rename from hidl/camera/default/CameraParameters.cpp rename to aidl/camera/common/CameraParameters.cpp diff --git a/hidl/camera/default/Exif.cpp b/aidl/camera/common/Exif.cpp similarity index 100% rename from hidl/camera/default/Exif.cpp rename to aidl/camera/common/Exif.cpp diff --git a/hidl/camera/default/HandleImporter.cpp b/aidl/camera/common/HandleImporter.cpp similarity index 100% rename from hidl/camera/default/HandleImporter.cpp rename to aidl/camera/common/HandleImporter.cpp diff --git a/hidl/camera/default/SimpleThread.cpp b/aidl/camera/common/SimpleThread.cpp similarity index 100% rename from hidl/camera/default/SimpleThread.cpp rename to aidl/camera/common/SimpleThread.cpp diff --git a/hidl/camera/default/VendorTagDescriptor.cpp b/aidl/camera/common/VendorTagDescriptor.cpp similarity index 100% rename from hidl/camera/default/VendorTagDescriptor.cpp rename to aidl/camera/common/VendorTagDescriptor.cpp diff --git a/aidl/camera/common/include b/aidl/camera/common/include new file mode 120000 index 0000000..3a7ab75 --- /dev/null +++ b/aidl/camera/common/include @@ -0,0 +1 @@ +../../../../../hardware/interfaces/camera/common/default/include \ No newline at end of file diff --git a/aidl/camera/device/Android.bp b/aidl/camera/device/Android.bp index 9ff0edf..7168f5c 100644 --- a/aidl/camera/device/Android.bp +++ b/aidl/camera/device/Android.bp @@ -6,7 +6,10 @@ cc_library_shared { name: "camera.device-impl.samsung", - defaults: ["android.hardware.graphics.common-ndk_shared"], + defaults: [ + "android.hardware.graphics.common-ndk_shared", + "samsung_camera3_defaults", + ], vendor: true, srcs: [ "CameraDevice.cpp", @@ -27,8 +30,11 @@ cc_library_shared { "libutils", ], static_libs: [ - "android.hardware.camera.common-helper", + "android.hardware.camera.common-helper.samsung", "libaidlcommonsupport", ], + header_libs: [ + "libhardware_headers.camera3_samsung", + ], export_include_dirs: ["."], } diff --git a/hidl/camera/libhardware_headers/Android.bp b/aidl/camera/libhardware_headers/Android.bp similarity index 100% rename from hidl/camera/libhardware_headers/Android.bp rename to aidl/camera/libhardware_headers/Android.bp diff --git a/hidl/camera/libhardware_headers/include/hardware/camera.h b/aidl/camera/libhardware_headers/include/hardware/camera.h similarity index 100% rename from hidl/camera/libhardware_headers/include/hardware/camera.h rename to aidl/camera/libhardware_headers/include/hardware/camera.h diff --git a/hidl/camera/libhardware_headers/include/hardware/camera3.h b/aidl/camera/libhardware_headers/include/hardware/camera3.h similarity index 100% rename from hidl/camera/libhardware_headers/include/hardware/camera3.h rename to aidl/camera/libhardware_headers/include/hardware/camera3.h diff --git a/hidl/camera/libhardware_headers/include/hardware/camera_common.h b/aidl/camera/libhardware_headers/include/hardware/camera_common.h similarity index 100% rename from hidl/camera/libhardware_headers/include/hardware/camera_common.h rename to aidl/camera/libhardware_headers/include/hardware/camera_common.h diff --git a/aidl/camera/provider/Android.bp b/aidl/camera/provider/Android.bp index 87af078..1c223f0 100644 --- a/aidl/camera/provider/Android.bp +++ b/aidl/camera/provider/Android.bp @@ -6,6 +6,7 @@ cc_binary { name: "android.hardware.camera.provider-service.samsung", + defaults: ["samsung_camera3_defaults"], init_rc: ["android.hardware.camera.provider-service.samsung.rc"], vintf_fragments: ["android.hardware.camera.provider-service.samsung.xml"], vendor: true, @@ -29,7 +30,10 @@ cc_binary { "libutils", ], static_libs: [ - "android.hardware.camera.common-helper", + "android.hardware.camera.common-helper.samsung", "libaidlcommonsupport", ], + header_libs: [ + "libhardware_headers.camera3_samsung", + ], } diff --git a/hidl/camera/default/include b/hidl/camera/default/include deleted file mode 120000 index 9d90818..0000000 --- a/hidl/camera/default/include +++ /dev/null @@ -1 +0,0 @@ -../../../../../hardware/interfaces/camera/common/default/include/ \ No newline at end of file -- 2.20.1