hidl: camera: Add camera common helper

* Thus allowing device-specific mods in camera_common.h

Change-Id: I3bc89819440f1221fd5a03549971039797a7973e

hidl/camera/default/Android.bp

@@ -0,0 +1,43 @@
+cc_library_static {
+    name: "android.hardware.camera.common-helper.samsung",
+    vendor_available: true,
+    defaults: [
+        "hidl_defaults",
+        "samsung_camera3_defaults",
+    ],
+    srcs: [
+        "CameraModule.cpp",
+        "CameraMetadata.cpp",
+        "CameraParameters.cpp",
+        "VendorTagDescriptor.cpp",
+        "HandleImporter.cpp",
+        "Exif.cpp",
+        "SimpleThread.cpp",
+    ],
+    cflags: [
+        "-Werror",
+        "-Wextra",
+        "-Wall",
+    ],
+    shared_libs: [
+        "liblog",
+        "libgralloctypes",
+        "libhardware",
+        "libcamera_metadata",
+        "android.hardware.graphics.mapper@2.0",
+        "android.hardware.graphics.mapper@3.0",
+        "android.hardware.graphics.mapper@4.0",
+        "libexif",
+    ],
+    include_dirs: ["system/media/private/camera/include"],
+    header_libs: ["libhardware_headers.camera3_samsung"],
+    export_include_dirs: ["include"],
+}
+
+// NOTE: Deprecated module kept for compatibility reasons.
+// Depend on "android.hardware.camera.common-helper.samsung" instead
+cc_library_static {
+    name: "android.hardware.camera.common@1.0-helper.samsung",
+    vendor_available: true,
+    whole_static_libs: ["android.hardware.camera.common-helper.samsung"],
+}

hidl/camera/default/CameraMetadata.cpp

@@ -0,0 +1 @@
+../../../../../hardware/interfaces/camera/common/default/CameraMetadata.cpp

hidl/camera/default/CameraModule.cpp

@@ -0,0 +1 @@
+../../../../../hardware/interfaces/camera/common/default/CameraModule.cpp

hidl/camera/default/CameraParameters.cpp

@@ -0,0 +1 @@
+../../../../../hardware/interfaces/camera/common/default/CameraParameters.cpp

hidl/camera/default/Exif.cpp

@@ -0,0 +1 @@
+../../../../../hardware/interfaces/camera/common/default/Exif.cpp

hidl/camera/default/HandleImporter.cpp

@@ -0,0 +1 @@
+../../../../../hardware/interfaces/camera/common/default/HandleImporter.cpp

hidl/camera/default/SimpleThread.cpp

@@ -0,0 +1 @@
+../../../../../hardware/interfaces/camera/common/default/SimpleThread.cpp

hidl/camera/default/VendorTagDescriptor.cpp

@@ -0,0 +1 @@
+../../../../../hardware/interfaces/camera/common/default/VendorTagDescriptor.cpp

hidl/camera/default/include

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

hidl/camera/device/3.2/default/Android.bp

@@ -26,7 +26,7 @@ cc_library_shared {
         "libfmq",
     ],
     static_libs: [
-        "android.hardware.camera.common@1.0-helper",
+        "android.hardware.camera.common@1.0-helper.samsung",
     ],
     header_libs: ["libhardware_headers.camera3_samsung"],
     export_include_dirs: ["."],

hidl/camera/device/3.3/default/Android.bp

@@ -28,7 +28,7 @@ cc_library_shared {
         "libfmq",
     ],
     static_libs: [
-        "android.hardware.camera.common@1.0-helper",
+        "android.hardware.camera.common@1.0-helper.samsung",
     ],
     header_libs: ["libhardware_headers.camera3_samsung"],
     export_include_dirs: ["."],

hidl/camera/device/3.4/default/Android.bp

@@ -47,7 +47,7 @@ cc_library_shared {
         "libfmq",
     ],
     static_libs: [
-        "android.hardware.camera.common@1.0-helper",
+        "android.hardware.camera.common@1.0-helper.samsung",
     ],
     header_libs: ["libhardware_headers.camera3_samsung"],
     local_include_dirs: ["include/device_v3_4_impl"],

hidl/camera/device/3.5/default/Android.bp

@@ -47,7 +47,7 @@ cc_library_shared {
         "libcamera_metadata",
     ],
     static_libs: [
-        "android.hardware.camera.common@1.0-helper",
+        "android.hardware.camera.common@1.0-helper.samsung",
     ],
     header_libs: ["libhardware_headers.camera3_samsung"],
     local_include_dirs: ["include/device_v3_5_impl"],

hidl/camera/libhardware_headers/include/hardware/camera.h

@@ -0,0 +1 @@
+../../../../../../../hardware/libhardware/include/hardware/camera.h

hidl/camera/libhardware_headers/include/hardware/camera3.h

@@ -18,7 +18,7 @@
 #define ANDROID_INCLUDE_CAMERA3_H
 
 #include <system/camera_metadata.h>
-#include <hardware/camera_common.h>
+#include "camera_common.h"
 
 /**
  * Camera device HAL 3.6[ CAMERA_DEVICE_API_VERSION_3_6 ]

hidl/camera/provider/2.4/Android.bp

@@ -29,11 +29,12 @@ cc_library_shared {
         "libutils",
     ],
     static_libs: [
-        "android.hardware.camera.common@1.0-helper",
+        "android.hardware.camera.common@1.0-helper.samsung",
     ],
     header_libs: [
         "camera.device@3.4-impl_headers",
         "camera.device@3.5-impl_headers",
+        "libhardware_headers.camera3_samsung"
     ],
     export_include_dirs: ["."],
 }

hidl/camera/provider/2.5/Android.bp

@@ -49,11 +49,12 @@ cc_library_shared {
         "libutils",
     ],
     static_libs: [
-        "android.hardware.camera.common@1.0-helper",
+        "android.hardware.camera.common@1.0-helper.samsung",
     ],
     header_libs: [
         "camera.device@3.4-impl_headers",
         "camera.device@3.5-impl_headers",
+        "libhardware_headers.camera3_samsung"
     ],
     export_include_dirs: ["."],
 }
@@ -87,11 +88,12 @@ cc_defaults {
         "libutils",
     ],
     static_libs: [
-        "android.hardware.camera.common@1.0-helper",
+        "android.hardware.camera.common@1.0-helper.samsung",
     ],
     header_libs: [
         "camera.device@3.4-impl_headers",
-        "camera.device@3.5-impl_headers"
+        "camera.device@3.5-impl_headers",
+        "libhardware_headers.camera3_samsung"
     ],
 }