gs201: enable google-armnn GPU neuralnetworks hal

Re-enable this hal now that OpenCL is running

Test: build, see hal, pass 54k CTS tests (1 seems to hang).
Fixes: 193679354
Change-Id: Ie88d2f6c4853145d8f8d9ed552ca33de75899157
This commit is contained in:
Kevin DuBois 2021-07-14 16:36:25 -07:00
parent 9b4560b850
commit 7c995777cb
5 changed files with 13 additions and 17 deletions

View file

@ -153,7 +153,7 @@ PRODUCT_PACKAGES += \
libGLES_mali-gs201-prebuilt \
vulkan.gs201-prebuilt \
libOpenCL \
# android.hardware.neuralnetworks@1.3-service-armnn \
android.hardware.neuralnetworks@1.3-service-armnn
# libgpudataproducer
ifeq ($(USE_SWIFTSHADER),true)

View file

@ -145,12 +145,12 @@
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<version>1.2</version>
<version>1.3</version>
<interface>
<name>IDevice</name>
<instance>armnn</instance>
<instance>google-armnn</instance>
</interface>
<fqname>@1.2::IDevice/armnn</fqname>
<fqname>@1.3::IDevice/google-armnn</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>

View file

@ -101,12 +101,12 @@
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<version>1.2</version>
<version>1.3</version>
<interface>
<name>IDevice</name>
<instance>armnn</instance>
<instance>google-armnn</instance>
</interface>
<fqname>@1.2::IDevice/armnn</fqname>
<fqname>@1.3::IDevice/google-armnn</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.nfc</name>

View file

@ -129,18 +129,16 @@
<instance>default</instance>
</interface>
</hal>
<!--
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<version>1.2</version>
<version>1.3</version>
<interface>
<name>IDevice</name>
<instance>armnn</instance>
<instance>google-armnn</instance>
</interface>
<fqname>@1.2::IDevice/armnn</fqname>
<fqname>@1.3::IDevice/google-armnn</fqname>
</hal>
-->
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>

View file

@ -94,18 +94,16 @@
<transport>hwbinder</transport>
<fqname>@1.2::IBootControl/default</fqname>
</hal>
<!--
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<version>1.2</version>
<version>1.3</version>
<interface>
<name>IDevice</name>
<instance>armnn</instance>
<instance>google-armnn</instance>
</interface>
<fqname>@1.2::IDevice/armnn</fqname>
<fqname>@1.3::IDevice/google-armnn</fqname>
</hal>
-->
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>