Kang Neural Networks from crosshatch

Change-Id: I7a196c8e22e2b381543f68669fcc9cc8928fdb53
diff --git a/Android.bp b/Android.bp
index 1a9f8d0..5f1f0dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -166,15 +166,6 @@
 }
 
 prebuilt_etc_xml {
-	name: "android.hardware.neuralnetworks@1.3-service-qti",
-	owner: "shift",
-	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml",
-	filename_from_src: true,
-	sub_dir: "vintf/manifest",
-	soc_specific: true,
-}
-
-prebuilt_etc_xml {
 	name: "vendor.qti.gnss@3.0-service",
 	owner: "shift",
 	src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@3.0-service.xml",
diff --git a/axolotl-vendor.mk b/axolotl-vendor.mk
index e70c641..8b8315e 100644
--- a/axolotl-vendor.mk
+++ b/axolotl-vendor.mk
@@ -949,7 +949,6 @@
     com.qti.dpmframework \
     dpmapi \
     qcrilhook \
-    android.hardware.neuralnetworks@1.3-service-qti \
     vendor.qti.gnss@3.0-service
 PRODUCT_COPY_FILES += \
     vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.3-service.widevine \
diff --git a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
index 7f60a6f..ccde1de 100644
--- a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
+++ b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
Binary files differ
diff --git a/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml b/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
deleted file mode 100644
index 992821e..0000000
--- a/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Copyright (c) 2020, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.3::IDevice/qti-default</fqname>
-        <fqname>@1.3::IDevice/qti-dsp</fqname>
-        <fqname>@1.3::IDevice/qti-gpu</fqname>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so b/proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so
index 845877d..20a3e66 100644
--- a/proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so
+++ b/proprietary/vendor/lib/rfsa/adsp/libhexagon_nn_skel.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libhexagon_nn_stub.so b/proprietary/vendor/lib64/libhexagon_nn_stub.so
index 68fcff9..6cdf5a8 100644
--- a/proprietary/vendor/lib64/libhexagon_nn_stub.so
+++ b/proprietary/vendor/lib64/libhexagon_nn_stub.so
Binary files differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-adreno.so b/proprietary/vendor/lib64/unnhal-acc-adreno.so
index 2311fb9..77689e0 100644
--- a/proprietary/vendor/lib64/unnhal-acc-adreno.so
+++ b/proprietary/vendor/lib64/unnhal-acc-adreno.so
Binary files differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-common.so b/proprietary/vendor/lib64/unnhal-acc-common.so
index 40c743a..15297b7 100644
--- a/proprietary/vendor/lib64/unnhal-acc-common.so
+++ b/proprietary/vendor/lib64/unnhal-acc-common.so
Binary files differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-hvx.so b/proprietary/vendor/lib64/unnhal-acc-hvx.so
index 45ce10f..ddde91d 100644
--- a/proprietary/vendor/lib64/unnhal-acc-hvx.so
+++ b/proprietary/vendor/lib64/unnhal-acc-hvx.so
Binary files differ