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
This commit is contained in:
Jesse Hall 2021-06-11 15:50:06 -07:00
parent 4820858f2f
commit 71aa8f3301

View file

@ -138,17 +138,18 @@ USE_SWIFTSHADER := false
# HWUI # HWUI
TARGET_USES_VULKAN = false TARGET_USES_VULKAN = false
PRODUCT_SOONG_NAMESPACES += \ # TODO(b/185349920)
vendor/arm/mali/valhall \ # PRODUCT_SOONG_NAMESPACES += \
vendor/arm/mali/valhall/cl \ # vendor/arm/mali/valhall \
vendor/arm/mali/valhall/libmali \ # vendor/arm/mali/valhall/cl \
vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader # vendor/arm/mali/valhall/libmali \
# vendor/arm/mali/valhall/cinstr/production/gpu-hwc-reader
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
mali_csffw.bin \ mali_csffw.bin \
libGLES_mali-gs201-prebuilt \ libGLES_mali-gs201-prebuilt \
vulkan.gs201-prebuilt \ vulkan.gs201-prebuilt \
# libOpenCL \ libOpenCL \
# android.hardware.neuralnetworks@1.3-service-armnn \ # android.hardware.neuralnetworks@1.3-service-armnn \
# libgpudataproducer # libgpudataproducer