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

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

diff --git a/device.mk b/device.mk
index 37df4d9b..fe4f9e13 100644
--- a/device.mk
+++ b/device.mk
@@ -252,9 +252,18 @@ PRODUCT_PACKAGES += \
 	csffw_image_prebuilt__firmware_prebuilt_todx_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
+
 # Mali Configuration Properties
 # b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2
 PRODUCT_VENDOR_PROPERTIES += \