From 7745a679a126f58f01149abb0d540e1daa8ea94f Mon Sep 17 00:00:00 2001
From: Jeremy Kemp <jeremykemp@google.com>
Date: Wed, 22 May 2024 09:58:32 +0100
Subject: [PATCH] Add Mali OpenCL ICD to PRODUCT_PACKAGES

Bug: 324057328
Test: clpeak
Change-Id: I7b7de856d1bb090ace31d1938e69069e24e79d7f
---
 device.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 929f8f52..3abc7e5f 100644
--- a/device.mk
+++ b/device.mk
@@ -217,9 +217,18 @@ include device/google/gs-common/gpu/gpu.mk
 PRODUCT_PACKAGES += \
 	libGLES_mali \
 	vulkan.mali \
-	libOpenCL \
 	libgpudataproducer
 
+# Install the OpenCL ICD Loader
+PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader
+PRODUCT_PACKAGES += \
+       libOpenCL \
+       mali_icd__customer_pixel_opencl-icd_ARM.icd
+ifeq ($(DEVICE_IS_64BIT_ONLY),false)
+PRODUCT_PACKAGES += \
+	mali_icd__customer_pixel_opencl-icd_ARM32.icd
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.vulkan=mali