diff --git a/bsp_diff/caas/device/intel/project-celadon/caas/0001-mixin-up-diff-for-including-multicamapp.patch b/bsp_diff/caas/device/intel/project-celadon/caas/0001-mixin-up-diff-for-including-multicamapp.patch deleted file mode 100644 index 0e7e80935f..0000000000 --- a/bsp_diff/caas/device/intel/project-celadon/caas/0001-mixin-up-diff-for-including-multicamapp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From df78c534b886a23eeb54163182e1acd18af1521a Mon Sep 17 00:00:00 2001 -From: gkdeepa -Date: Tue, 19 Oct 2021 09:16:14 +0530 -Subject: [PATCH] mixin up diff for including multicamapp - -Tracked-On: OAM-99740 -Signed-off-by: Deepa G K ---- - caas/device.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/caas/device.mk b/caas/device.mk -index 86ac653..a27c18b 100644 ---- a/caas/device.mk -+++ b/caas/device.mk -@@ -525,7 +525,7 @@ PRODUCT_PROPERTY_OVERRIDES += ro.vendor.remote.sf.fake_camera ="both" \ - # Only include test apps in eng or userdebug builds. - #PRODUCT_PACKAGES_DEBUG += TestingCamera - --#PRODUCT_PACKAGES += MultiCameraApp -+PRODUCT_PACKAGES += MultiCameraApp - ############################################################## - # Source: device/intel/mixins/groups/rfkill/true/product.mk - ############################################################## --- -2.17.1 - diff --git a/bsp_diff/caas_cfc/device/intel/mixins/0001-Include-VHAL-for-camera.patch b/bsp_diff/caas_cfc/device/intel/mixins/0001-Include-VHAL-for-camera.patch new file mode 100644 index 0000000000..ab5a8d145e --- /dev/null +++ b/bsp_diff/caas_cfc/device/intel/mixins/0001-Include-VHAL-for-camera.patch @@ -0,0 +1,60 @@ +From 8fbc303f1bb9e9d4f101d4af69669a01ce4ed359 Mon Sep 17 00:00:00 2001 +From: gkdeepa +Date: Tue, 24 Aug 2021 08:04:00 +0530 +Subject: [PATCH] Include VHAL for camera + +legacy hal inclusion +properties declaration +product package inclusion for libs + +Tracked-On:OAM-99722 +Signed-off-by: gkdeepa g.k.deepa@intel.com +--- + groups/camera-ext/ext-camera-only/product.mk | 17 +++++++++++++++-- + groups/device-specific/caas_cfc/manifest.xml | 1 + + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/groups/camera-ext/ext-camera-only/product.mk b/groups/camera-ext/ext-camera-only/product.mk +index 815464c..84cb4ad 100644 +--- a/groups/camera-ext/ext-camera-only/product.mk ++++ b/groups/camera-ext/ext-camera-only/product.mk +@@ -5,9 +5,22 @@ PRODUCT_COPY_FILES += \ + + # External camera service + PRODUCT_PACKAGES += android.hardware.camera.provider@2.4-external-service \ ++ android.hardware.camera.provider@2.4-service_64 \ + android.hardware.camera.provider@2.4-impl ++#VHAL camera ++PRODUCT_PACKAGES += camera.$(TARGET_BOARD_PLATFORM) \ ++ camera.$(TARGET_BOARD_PLATFORM).jpeg + ++PRODUCT_PROPERTY_OVERRIDES += ro.vendor.remote.sf.fake_camera ="both" \ ++ ro.vendor.camera.in_frame_format.h264=false \ ++ ro.vendor.camera.in_frame_format.i420=true \ ++ ro.vendor.camera.decode.vaapi=false \ ++ ro.vendor.remote.sf.back_camera_hal= \ ++ ro.vendor.remote.sf.front_camera_hal= \ ++ ro.vendor.camera.transference="VSOCK" \ ++ vendor.camera.external="VHAL" ++#removing not required apps + # Only include test apps in eng or userdebug builds. +-PRODUCT_PACKAGES_DEBUG += TestingCamera ++#PRODUCT_PACKAGES_DEBUG += TestingCamera + +-PRODUCT_PACKAGES += MultiCameraApp ++#PRODUCT_PACKAGES += MultiCameraApp +diff --git a/groups/device-specific/caas_cfc/manifest.xml b/groups/device-specific/caas_cfc/manifest.xml +index 499945f..5a41ab8 100644 +--- a/groups/device-specific/caas_cfc/manifest.xml ++++ b/groups/device-specific/caas_cfc/manifest.xml +@@ -149,6 +149,7 @@ + + ICameraProvider + external/0 ++ legacy/0 + + + +-- +2.17.1 +