hidl: camera: Provide our own camera {device,provider}

[Linux4: Rebrand to samsung and provide both 32bit and 64bit services]

Change-Id: I17c4584b6e1c0ec0e7ea7182f276d6aed75ba277
urubino
LuK1337 7 months ago committed by Tim Zimmermann
parent 5295fb03e6
commit 548bf0660f
No known key found for this signature in database
GPG Key ID: 6DC21A63F819C5EF
  1. 33
      hidl/camera/device/3.2/default/Android.bp
  2. 1
      hidl/camera/device/3.2/default/CameraDevice.cpp
  3. 1
      hidl/camera/device/3.2/default/CameraDeviceSession.cpp
  4. 1
      hidl/camera/device/3.2/default/CameraDeviceSession.h
  5. 1
      hidl/camera/device/3.2/default/CameraDevice_3_2.h
  6. 1
      hidl/camera/device/3.2/default/convert.cpp
  7. 1
      hidl/camera/device/3.2/default/include
  8. 35
      hidl/camera/device/3.3/default/Android.bp
  9. 1
      hidl/camera/device/3.3/default/CameraDevice.cpp
  10. 1
      hidl/camera/device/3.3/default/CameraDeviceSession.cpp
  11. 1
      hidl/camera/device/3.3/default/CameraDeviceSession.h
  12. 1
      hidl/camera/device/3.3/default/CameraDevice_3_3.h
  13. 1
      hidl/camera/device/3.3/default/convert.cpp
  14. 1
      hidl/camera/device/3.3/default/include
  15. 54
      hidl/camera/device/3.4/default/Android.bp
  16. 1
      hidl/camera/device/3.4/default/CameraDevice.cpp
  17. 1
      hidl/camera/device/3.4/default/CameraDeviceSession.cpp
  18. 1
      hidl/camera/device/3.4/default/convert.cpp
  19. 1
      hidl/camera/device/3.4/default/include
  20. 51
      hidl/camera/device/3.5/default/Android.bp
  21. 1
      hidl/camera/device/3.5/default/CameraDevice.cpp
  22. 1
      hidl/camera/device/3.5/default/CameraDeviceSession.cpp
  23. 1
      hidl/camera/device/3.5/default/include
  24. 5
      hidl/camera/libhardware_headers/Android.bp
  25. 3564
      hidl/camera/libhardware_headers/include/hardware/camera3.h
  26. 40
      hidl/camera/provider/2.4/Android.bp
  27. 1
      hidl/camera/provider/2.4/CameraProvider_2_4.h
  28. 1
      hidl/camera/provider/2.4/LegacyCameraProviderImpl_2_4.cpp
  29. 1
      hidl/camera/provider/2.4/LegacyCameraProviderImpl_2_4.h
  30. 88
      hidl/camera/provider/2.5/Android.bp
  31. 1
      hidl/camera/provider/2.5/CameraProvider_2_5.h
  32. 1
      hidl/camera/provider/2.5/LegacyCameraProviderImpl_2_5.cpp
  33. 1
      hidl/camera/provider/2.5/LegacyCameraProviderImpl_2_5.h
  34. 9
      hidl/camera/provider/2.5/android.hardware.camera.provider@2.5-service.samsung.rc
  35. 9
      hidl/camera/provider/2.5/android.hardware.camera.provider@2.5-service_64.samsung.rc
  36. 1
      hidl/camera/provider/2.5/service.cpp

@ -0,0 +1,33 @@
cc_library_shared {
name: "camera.device@3.2-impl.samsung",
defaults: ["hidl_defaults"],
proprietary: true,
srcs: [
"CameraDevice.cpp",
"CameraDeviceSession.cpp",
"convert.cpp",
],
shared_libs: [
"libhidlbase",
"libutils",
"libcutils",
"android.hardware.camera.device@3.2",
"android.hardware.camera.provider@2.4",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@3.0",
"android.hardware.graphics.mapper@4.0",
"liblog",
"libgralloctypes",
"libhardware",
"libcamera_metadata",
"libfmq",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
],
header_libs: ["libhardware_headers.camera3_samsung"],
export_include_dirs: ["."],
export_shared_lib_headers: [
"libfmq",
],
}

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.2/default/CameraDevice.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.2/default/CameraDeviceSession.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.2/default/CameraDeviceSession.h

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.2/default/CameraDevice_3_2.h

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.2/default/convert.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.2/default/include

@ -0,0 +1,35 @@
cc_library_shared {
name: "camera.device@3.3-impl.samsung",
defaults: ["hidl_defaults"],
proprietary: true,
srcs: [
"CameraDevice.cpp",
"CameraDeviceSession.cpp",
"convert.cpp",
],
shared_libs: [
"libhidlbase",
"libutils",
"libcutils",
"camera.device@3.2-impl.samsung",
"android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.3",
"android.hardware.camera.provider@2.4",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@3.0",
"android.hardware.graphics.mapper@4.0",
"liblog",
"libgralloctypes",
"libhardware",
"libcamera_metadata",
"libfmq",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
],
header_libs: ["libhardware_headers.camera3_samsung"],
export_include_dirs: ["."],
export_shared_lib_headers: [
"libfmq",
],
}

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.3/default/CameraDevice.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.3/default/CameraDeviceSession.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.3/default/CameraDeviceSession.h

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.3/default/CameraDevice_3_3.h

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.3/default/convert.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.3/default/include

@ -0,0 +1,54 @@
//
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
cc_library_shared {
name: "camera.device@3.4-impl.samsung",
defaults: ["hidl_defaults"],
proprietary: true,
vendor: true,
srcs: [
"CameraDevice.cpp",
"CameraDeviceSession.cpp",
"convert.cpp",
],
shared_libs: [
"libhidlbase",
"libutils",
"libcutils",
"camera.device@3.2-impl.samsung",
"camera.device@3.3-impl.samsung",
"android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.3",
"android.hardware.camera.device@3.4",
"android.hardware.camera.provider@2.4",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@3.0",
"android.hardware.graphics.mapper@4.0",
"liblog",
"libgralloctypes",
"libhardware",
"libcamera_metadata",
"libfmq",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
],
header_libs: ["libhardware_headers.camera3_samsung"],
local_include_dirs: ["include/device_v3_4_impl"],
export_shared_lib_headers: [
"libfmq",
],
}

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.4/default/CameraDevice.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.4/default/CameraDeviceSession.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.4/default/convert.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.4/default/include

@ -0,0 +1,51 @@
//
// Copyright (C) 2018 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
cc_library_shared {
name: "camera.device@3.5-impl.samsung",
defaults: ["hidl_defaults"],
proprietary: true,
vendor: true,
srcs: [
"CameraDevice.cpp",
"CameraDeviceSession.cpp",
],
shared_libs: [
"libhidlbase",
"libutils",
"libcutils",
"camera.device@3.2-impl.samsung",
"camera.device@3.3-impl.samsung",
"camera.device@3.4-impl.samsung",
"android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.3",
"android.hardware.camera.device@3.4",
"android.hardware.camera.device@3.5",
"android.hardware.camera.provider@2.4",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@3.0",
"android.hardware.graphics.mapper@4.0",
"liblog",
"libgralloctypes",
"libhardware",
"libcamera_metadata",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
],
header_libs: ["libhardware_headers.camera3_samsung"],
local_include_dirs: ["include/device_v3_5_impl"],
}

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.5/default/CameraDevice.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.5/default/CameraDeviceSession.cpp

@ -0,0 +1 @@
../../../../../../../hardware/interfaces/camera/device/3.5/default/include

@ -0,0 +1,5 @@
cc_library_headers {
name: "libhardware_headers.camera3_samsung",
export_include_dirs: ["include"],
vendor_available: true,
}

File diff suppressed because it is too large Load Diff

@ -0,0 +1,40 @@
cc_library_shared {
name: "android.hardware.camera.provider@2.4-legacy.samsung",
defaults: ["hidl_defaults"],
proprietary: true,
srcs: ["LegacyCameraProviderImpl_2_4.cpp"],
shared_libs: [
"android.hardware.camera.common@1.0",
"android.hardware.camera.device@1.0",
"android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.3",
"android.hardware.camera.device@3.4",
"android.hardware.camera.device@3.5",
"android.hardware.camera.provider@2.4",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@3.0",
"android.hardware.graphics.mapper@4.0",
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
"camera.device@1.0-impl",
"camera.device@3.2-impl.samsung",
"camera.device@3.3-impl.samsung",
"camera.device@3.4-impl.samsung",
"camera.device@3.5-impl.samsung",
"libcamera_metadata",
"libcutils",
"libhardware",
"libhidlbase",
"liblog",
"libutils",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
],
header_libs: [
"camera.device@3.4-impl_headers",
"camera.device@3.5-impl_headers",
],
export_include_dirs: ["."],
}

@ -0,0 +1 @@
../../../../../../hardware/interfaces/camera/provider/2.4/default/CameraProvider_2_4.h

@ -0,0 +1 @@
../../../../../../hardware/interfaces/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.cpp

@ -0,0 +1 @@
../../../../../../hardware/interfaces/camera/provider/2.4/default/LegacyCameraProviderImpl_2_4.h

@ -0,0 +1,88 @@
cc_library_shared {
name: "android.hardware.camera.provider@2.5-legacy.samsung",
proprietary: true,
srcs: ["LegacyCameraProviderImpl_2_5.cpp"],
shared_libs: [
"android.hardware.camera.common@1.0",
"android.hardware.camera.device@1.0",
"android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.3",
"android.hardware.camera.device@3.4",
"android.hardware.camera.device@3.5",
"android.hardware.camera.provider@2.4",
"android.hardware.camera.provider@2.4-legacy.samsung",
"android.hardware.camera.provider@2.5",
"android.hardware.graphics.mapper@2.0",
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
"camera.device@1.0-impl",
"camera.device@3.2-impl.samsung",
"camera.device@3.3-impl.samsung",
"camera.device@3.4-impl.samsung",
"camera.device@3.5-impl.samsung",
"libcamera_metadata",
"libcutils",
"libhardware",
"libhidlbase",
"liblog",
"libutils",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
],
header_libs: [
"camera.device@3.4-impl_headers",
"camera.device@3.5-impl_headers",
],
export_include_dirs: ["."],
}
cc_defaults {
name: "camera_service_2_5_defaults.samsung",
defaults: ["hidl_defaults"],
proprietary: true,
relative_install_path: "hw",
srcs: ["service.cpp"],
shared_libs: [
"android.hardware.camera.common@1.0",
"android.hardware.camera.device@1.0",
"android.hardware.camera.device@3.2",
"android.hardware.camera.device@3.3",
"android.hardware.camera.device@3.4",
"android.hardware.camera.device@3.5",
"android.hardware.camera.provider@2.4",
"android.hardware.camera.provider@2.4-legacy.samsung",
"android.hardware.camera.provider@2.5",
"android.hardware.camera.provider@2.5-legacy.samsung",
"android.hardware.graphics.mapper@2.0",
"android.hidl.allocator@1.0",
"android.hidl.memory@1.0",
"libbinder",
"libcamera_metadata",
"libhardware",
"libhidlbase",
"liblog",
"libutils",
],
static_libs: [
"android.hardware.camera.common@1.0-helper",
],
header_libs: [
"camera.device@3.4-impl_headers",
"camera.device@3.5-impl_headers"
],
}
cc_binary {
name: "android.hardware.camera.provider@2.5-service.samsung",
defaults: ["camera_service_2_5_defaults.samsung"],
compile_multilib: "32",
init_rc: ["android.hardware.camera.provider@2.5-service.samsung.rc"],
}
cc_binary {
name: "android.hardware.camera.provider@2.5-service_64.samsung",
defaults: ["camera_service_2_5_defaults.samsung"],
compile_multilib: "64",
init_rc: ["android.hardware.camera.provider@2.5-service_64.samsung.rc"],
}

@ -0,0 +1 @@
../../../../../../hardware/interfaces/camera/provider/2.5/default/CameraProvider_2_5.h

@ -0,0 +1 @@
../../../../../../hardware/interfaces/camera/provider/2.5/default/LegacyCameraProviderImpl_2_5.cpp

@ -0,0 +1 @@
../../../../../../hardware/interfaces/camera/provider/2.5/default/LegacyCameraProviderImpl_2_5.h

@ -0,0 +1,9 @@
service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service.samsung
interface android.hardware.camera.provider@2.5::ICameraProvider legacy/0
interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0
class hal
user cameraserver
group audio camera input drmrpc
ioprio rt 4
capabilities SYS_NICE
task_profiles CameraServiceCapacity MaxPerformance

@ -0,0 +1,9 @@
service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service_64.samsung
interface android.hardware.camera.provider@2.5::ICameraProvider legacy/0
interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0
class hal
user cameraserver
group audio camera input drmrpc
ioprio rt 4
capabilities SYS_NICE
task_profiles CameraServiceCapacity MaxPerformance

@ -0,0 +1 @@
../../../../../../hardware/interfaces/camera/provider/2.5/default/service.cpp
Loading…
Cancel
Save