From f56e018ca48b522ec2906c80213c40caf1a2f2fa Mon Sep 17 00:00:00 2001
From: Kevin DuBois <kevindubois@google.com>
Date: Fri, 14 May 2021 08:35:52 -0700
Subject: [PATCH] Upgrade GPU NNhal to 1.3 revision.

Upgrades GPU NNHal to 1.3 revision.

Fixes: 187981206
Test: Boot, VTS for 1.3 revision
Change-Id: I2f860cd092168cb5093794dcfdef60242bfb9b6b
---
 device.mk       | 2 +-
 manifest.xml    | 4 ++--
 manifest_64.xml | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/device.mk b/device.mk
index 1be1d190..7b93f9af 100644
--- a/device.mk
+++ b/device.mk
@@ -118,7 +118,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # GPU profiling
 PRODUCT_PRODUCT_PROPERTIES += graphics.gpu.profiler.support=true
 PRODUCT_PACKAGES += \
-	android.hardware.neuralnetworks@1.2-service-armnn
+	android.hardware.neuralnetworks@1.3-service-armnn
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	telephony.active_modems.max_count=2
diff --git a/manifest.xml b/manifest.xml
index 73b5503c..a4594f5e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -110,12 +110,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>
         </interface>
-        <fqname>@1.2::IDevice/armnn</fqname>
+        <fqname>@1.3::IDevice/armnn</fqname>
     </hal>
     <hal format="hidl">
        <name>android.hardware.nfc</name>
diff --git a/manifest_64.xml b/manifest_64.xml
index cdf30745..9ba0130c 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>
         </interface>
-        <fqname>@1.2::IDevice/armnn</fqname>
+        <fqname>@1.3::IDevice/armnn</fqname>
     </hal>
--->
     <hal format="hidl">
        <name>android.hardware.neuralnetworks</name>
        <transport>hwbinder</transport>