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

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

diff --git a/device.mk b/device.mk
index de9d31c1..1380cac6 100644
--- a/device.mk
+++ b/device.mk
@@ -269,9 +269,18 @@ PRODUCT_PACKAGES += \
 	csffw_image_prebuilt__firmware_prebuilt_ttux_mali_csffw.bin \
 	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
+
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_PACKAGES += \
 	libEGL_angle \