From 7c995777cb4106039a95744137f578ca25a29285 Mon Sep 17 00:00:00 2001
From: Kevin DuBois <kevindubois@google.com>
Date: Wed, 14 Jul 2021 16:36:25 -0700
Subject: [PATCH] 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
---
 device.mk                | 2 +-
 manifest-gralloc3.xml    | 6 +++---
 manifest.xml             | 6 +++---
 manifest_64-gralloc3.xml | 8 +++-----
 manifest_64.xml          | 8 +++-----
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/device.mk b/device.mk
index 53ad0ee0..34937492 100644
--- a/device.mk
+++ b/device.mk
@@ -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)
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 7458db01..c69e95a8 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -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>
diff --git a/manifest.xml b/manifest.xml
index f6f9fb42..263f623e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -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>
diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml
index 56db419e..eac5e452 100644
--- a/manifest_64-gralloc3.xml
+++ b/manifest_64-gralloc3.xml
@@ -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>
diff --git a/manifest_64.xml b/manifest_64.xml
index c881ec22..9d9e206d 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -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>