From 876493dfe6db119d0e52e4aa26d99cccd6752c43 Mon Sep 17 00:00:00 2001
From: Michael Butler <butlermichael@google.com>
Date: Mon, 16 Oct 2017 14:03:36 -0700
Subject: [PATCH] Disable NN API HVX service for OC-MR1 release

Bug: 67478959
Test: mma
Test: hvx service is no longer started
Test: hvx service is no longer uploaded to device
Test: frameworks/ml/nn's NeuralNetworksTest
Change-Id: I9b3571d246b1e48815bfce8a791cfcd2bc609778
---
 device.mk    | 4 ----
 manifest.xml | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/device.mk b/device.mk
index a5e60969..dfdac823 100755
--- a/device.mk
+++ b/device.mk
@@ -285,10 +285,6 @@ PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-impl    \
     android.hardware.bluetooth@1.0-service
 
-# Neuralnetworks HAL
-PRODUCT_PACKAGES += \
-    android.hardware.neuralnetworks@1.0-service-hvx
-
 # DRM HAL
 PRODUCT_PACKAGES += \
   android.hardware.drm@1.0-impl \
diff --git a/manifest.xml b/manifest.xml
index 204bd585..c553bb36 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -189,15 +189,6 @@
             <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>