neuralnetworks: kang neural networks from PNX
Test: atest VtsHalNeuralnetworksV1_0TargetTest
Test: atest VtsHalNeuralnetworksV1_1TargetTest
Test: atest VtsHalNeuralnetworksV1_2TargetTest
Test: atest VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I19b3a9241775e19439c182f8db5589dbe611639c
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/Android.bp b/Android.bp
index 3f07527..d1a50a1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -343,6 +343,15 @@
}
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@4.0-service",
owner: "shift",
src: "proprietary/vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml",
diff --git a/axolotl-vendor.mk b/axolotl-vendor.mk
index ba72514..44ae0d1 100644
--- a/axolotl-vendor.mk
+++ b/axolotl-vendor.mk
@@ -72,7 +72,7 @@
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.gnss@2.1-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gnss@2.1-service-qti \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.keymaster@4.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@4.0-service-qti \
- vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.2-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.neuralnetworks@1.2-service-qti \
+ vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.neuralnetworks@1.3-service-qti \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.sensors@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.sensors@2.0-service \
vendor/shift/axolotl/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
vendor/shift/axolotl/proprietary/vendor/bin/hw/vendor.display.color@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.display.color@1.0-service \
@@ -173,7 +173,7 @@
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.1-service-qti.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0-service-qti.rc \
- vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.2-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.2-service-qti.rc \
+ vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.sensors@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.sensors@2.0-service.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
vendor/shift/axolotl/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
@@ -1023,6 +1023,7 @@
vendor.qti.hardware.data.iwlan-V1.0-java \
vendor.qti.hardware.data.qmi-V1.0-java \
android.hardware.gnss@2.1-service-qti \
+ android.hardware.neuralnetworks@1.3-service-qti \
vendor.qti.gnss@4.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.2-service-qti b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.2-service-qti
deleted file mode 100644
index c044dba..0000000
--- a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.2-service-qti
+++ /dev/null
Binary files differ
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
new file mode 100644
index 0000000..7f60a6f
--- /dev/null
+++ b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
Binary files differ
diff --git a/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.2-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
similarity index 75%
rename from proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.2-service-qti.rc
rename to proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
index 3e7846d..1d6c390 100644
--- a/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.2-service-qti.rc
+++ b/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
@@ -3,13 +3,11 @@
# Confidential and Proprietary - Qualcomm Technologies, Inc.
#
-service neuralnetworks_hal_service /vendor/bin/hw/android.hardware.neuralnetworks@1.2-service-qti
+service neuralnetworks_hal_service /vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
class hal
user system
group system
- capabilities SYS_NICE
- rlimit rtprio 10 10
- writepid /dev/stune/top-app/tasks
+ writepid /dev/stune/nnapi-hal/tasks
#Below changes moved from init.target.rc as part of go/FR53051
on post-fs-data
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
new file mode 100644
index 0000000..992821e
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml
@@ -0,0 +1,36 @@
+<!-- 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 0e862d6..845877d 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 f58f7d5..68fcff9 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 752aa73..2311fb9 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 2c8fa0b..40c743a 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 5615639..45ce10f 100644
--- a/proprietary/vendor/lib64/unnhal-acc-hvx.so
+++ b/proprietary/vendor/lib64/unnhal-acc-hvx.so
Binary files differ