From 612af23b91bb2877422ddc1f624baaf8f0b6f5b5 Mon Sep 17 00:00:00 2001 From: manxiaoliang Date: Sun, 28 Jul 2024 15:39:34 +0000 Subject: [PATCH] Removing few hwc3 patches Removing all hwc3 patches. These patches were enable hwc3 aidl sevice. Tests Done: Boot check Tracked-On: OAM-122744 Signed-off-by: manxiaoliang --- ...composer3-AIDL-HAL-service-in-Androi.patch | 58 ------------------- ...olicy-for-composer3-AIDL-HAL-service.patch | 23 -------- 2 files changed, 81 deletions(-) delete mode 100644 bsp_diff/common/device/intel/mixins/0001-Enable-graphics.composer3-AIDL-HAL-service-in-Androi.patch delete mode 100644 bsp_diff/common/device/intel/sepolicy/06_0001-Add-sepolicy-for-composer3-AIDL-HAL-service.patch diff --git a/bsp_diff/common/device/intel/mixins/0001-Enable-graphics.composer3-AIDL-HAL-service-in-Androi.patch b/bsp_diff/common/device/intel/mixins/0001-Enable-graphics.composer3-AIDL-HAL-service-in-Androi.patch deleted file mode 100644 index e2ebf636d7..0000000000 --- a/bsp_diff/common/device/intel/mixins/0001-Enable-graphics.composer3-AIDL-HAL-service-in-Androi.patch +++ /dev/null @@ -1,58 +0,0 @@ -From dd0fa415397b636b8b85f15b9961c000ddd8d3db Mon Sep 17 00:00:00 2001 -From: manxiaoliang -Date: Fri, 5 Apr 2024 15:02:25 +0530 -Subject: [PATCH] Enable graphics.composer3 AIDL HAL service in Android U. - -Tracked-On: OAM-110596 -Signed-off-by: manxiaoliang ---- - groups/device-specific/caas/manifest.xml | 8 ++++++++ - groups/device-specific/caas/product.mk | 1 + - groups/graphics/auto/BoardConfig.mk | 2 ++ - 3 files changed, 11 insertions(+) - -diff --git a/groups/device-specific/caas/manifest.xml b/groups/device-specific/caas/manifest.xml -index 25705c9..f01e474 100644 ---- a/groups/device-specific/caas/manifest.xml -+++ b/groups/device-specific/caas/manifest.xml -@@ -27,6 +27,14 @@ - default - - -+ -+ android.hardware.graphics.composer3 -+ 2 -+ -+ IComposer -+ default -+ -+ - - android.hardware.bluetooth - hwbinder -diff --git a/groups/device-specific/caas/product.mk b/groups/device-specific/caas/product.mk -index add83bf..2d3ee1a 100755 ---- a/groups/device-specific/caas/product.mk -+++ b/groups/device-specific/caas/product.mk -@@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \ - android.hardware.renderscript@1.0-impl \ - android.hardware.identity \ - android.hardware.identity-service.example \ -+ android.hardware.graphics.composer3-service.intel \ - android.hardware.media.omx@1.0-service - - -diff --git a/groups/graphics/auto/BoardConfig.mk b/groups/graphics/auto/BoardConfig.mk -index e0de4e3..94e7b75 100755 ---- a/groups/graphics/auto/BoardConfig.mk -+++ b/groups/graphics/auto/BoardConfig.mk -@@ -60,4 +60,6 @@ BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/graphics/mesa_acrn - BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/graphics/opencl - {{/opencl_sepolicy}} - -+BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/graphics/composer3 -+ - BOARD_SEPOLICY_M4DEFS += module_hwc_info_service=true --- -2.34.1 - diff --git a/bsp_diff/common/device/intel/sepolicy/06_0001-Add-sepolicy-for-composer3-AIDL-HAL-service.patch b/bsp_diff/common/device/intel/sepolicy/06_0001-Add-sepolicy-for-composer3-AIDL-HAL-service.patch deleted file mode 100644 index 73d4f58a24..0000000000 --- a/bsp_diff/common/device/intel/sepolicy/06_0001-Add-sepolicy-for-composer3-AIDL-HAL-service.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 902ea88a3e776802868751e284908d1f0c42e09b Mon Sep 17 00:00:00 2001 -From: manxiaoliang -Date: Thu, 24 Aug 2023 00:57:08 +0000 -Subject: [PATCH] Add sepolicy for composer3 AIDL HAL service. - -Tracked-On: OAM-110596 -Signed-off-by: manxiaoliang ---- - graphics/composer3/file_contexts | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 graphics/composer3/file_contexts - -diff --git a/graphics/composer3/file_contexts b/graphics/composer3/file_contexts -new file mode 100644 -index 0000000..9ca63c0 ---- /dev/null -+++ b/graphics/composer3/file_contexts -@@ -0,0 +1,2 @@ -+/(vendor|system/vendor)/bin/hw/android\.hardware\.graphics\.composer3-service\.intel u:object_r:hal_graphics_composer_default_exec:s0 -+ --- -2.25.1 -