From 71aa8f330112d783da4222d5abcadcdae3692bf7 Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Fri, 11 Jun 2021 15:50:06 -0700 Subject: [PATCH] gs201: install libOpenCL This required disabling the GPU-related PRODUCT_SOONG_NAMESPACES so that we don't get an installed-path collision between the prebuilt gs201 libOpenCL and the gs101 libOpenCL that we build from source. Once we're able to build both gs101 and gs201 from the same source (b/185349920) we'll need to re-add the namespaces. Bug: 190424017 Test: gfx-score Change-Id: I9095e099a120494fab0c33fc6bd1ace2c69f3bc4 --- device.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/device.mk b/device.mk index 00da5f29..5b5f6977 100644 --- a/device.mk +++ b/device.mk @@ -138,17 +138,18 @@ USE_SWIFTSHADER := false # HWUI TARGET_USES_VULKAN = false -PRODUCT_SOONG_NAMESPACES += \ - vendor/arm/mali/valhall \ - vendor/arm/mali/valhall/cl \ - vendor/arm/mali/valhall/libmali \ - vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader +# TODO(b/185349920) +# PRODUCT_SOONG_NAMESPACES += \ +# vendor/arm/mali/valhall \ +# vendor/arm/mali/valhall/cl \ +# vendor/arm/mali/valhall/libmali \ +# vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader PRODUCT_PACKAGES += \ mali_csffw.bin \ libGLES_mali-gs201-prebuilt \ vulkan.gs201-prebuilt \ -# libOpenCL \ + libOpenCL \ # android.hardware.neuralnetworks@1.3-service-armnn \ # libgpudataproducer