From 627510acb888b3dbd5aac8e71c4f5f81bc7fd73a Mon Sep 17 00:00:00 2001
From: Michael Butler <butlermichael@google.com>
Date: Wed, 25 Oct 2017 18:24:52 -0700
Subject: [PATCH] Enable hvx NN service for oc-mr1-nn-dev

Bug: 67478959
Test: mm, vts, cts
Change-Id: I0cc9dc1b9ba8773536952cd3a6252bc763e49baf
(cherry picked from commit 47f3f80d14b98f6597871be39ca7fa286baddcd6)
(cherry picked from commit 3ece4d183a1840e703e1d26ca83e708c5d533ad2)
---
 device.mk    | 4 ++++
 manifest.xml | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/device.mk b/device.mk
index a8ecd9ef..c61f2ada 100755
--- a/device.mk
+++ b/device.mk
@@ -315,6 +315,10 @@ PRODUCT_PACKAGES += \
   android.hardware.drm@1.0-service.widevine \
   android.hardware.drm@1.1-service.clearkey
 
+# NeuralNetworks HAL
+PRODUCT_PACKAGES += \
+    android.hardware.neuralnetworks@1.0-service-hvx
+
 # NFC packages
 PRODUCT_PACKAGES += \
     nfc_nci.msm8998 \
diff --git a/manifest.xml b/manifest.xml
index ae10532b..0eee0811 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -191,6 +191,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.neuralnetworks</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IDevice</name>
+            <instance>hvx</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.nfc</name>
         <transport>hwbinder</transport>