From 45e292f408fd61754ff9b89f93008f3613466136 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Fri, 18 Feb 2022 16:20:40 +0900 Subject: [PATCH] universal7885: camera.provider: Label and build * Except for a10 which has only 1 back cam Change-Id: Ibf6f07ea36c16880bf760bf66f5454485889c792 Signed-off-by: roynatech2544 --- universal7885-common/sepolicy/vendor/file_contexts | 1 + universal7885-common/universal7885-common.mk | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts index 1e3f0de..1399276 100644 --- a/universal7885-common/sepolicy/vendor/file_contexts +++ b/universal7885-common/sepolicy/vendor/file_contexts @@ -213,6 +213,7 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@[0-9]\.[0-9]-service\.samsung u:object_r:hal_keymaster_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@[0-9]\.[0-9]-service\.samsung u:object_r:hal_nfc_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.exynos7885 u:object_r:hal_usb_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@[0-9]\.[0-9]-service\.exynos7885 u:object_r:hal_camera_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@[0-9]\.[0-9]-service\.a10 u:object_r:hal_usb_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.gnss@[0-9]\.[0-9]-service u:object_r:hal_gnss_default_exec:s0 /(vendor|system/vendor)/firmware(/.*)? u:object_r:vendor_firmware_file:s0 diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index a515a1d..b8633ba 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -65,9 +65,13 @@ PRODUCT_COPY_FILES += \ hardware/samsung_slsi/libbt/conf/bt_vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor.conf # Camera +ifeq ($(findstring a10, $(TARGET_PRODUCT)),) +PRODUCT_PACKAGES += \ + android.hardware.camera.provider@2.5-service.exynos7885 +else PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.5-service - +endif # Camera app PRODUCT_PACKAGES += \ Footej