Remove settings for old ArmNN HIDL backend

Compile ArmNN shim over the support library.

Remove SELinux permissions and settings for the old HIDL backend.
The AIDL settings will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Merged-In: I3652eceb14d06a3e909444edc21ad86d9378bc6c
Change-Id: If26928b13cdd9f3342026af95b9446f2918784fa
This commit is contained in:
Renato Grottesi 2023-07-13 18:47:23 +00:00
parent 66f9fff138
commit c0baa17abe
4 changed files with 1 additions and 31 deletions

View file

@ -352,16 +352,6 @@ BOARD_VNDK_VERSION := current
# H/W align restriction of MM IPs # H/W align restriction of MM IPs
BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
# NeuralNetworks
GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zebu/prebuilts/libs)
ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT)))
ARMNN_COMPUTE_CL_ENABLE := 1
else
ARMNN_COMPUTE_CL_ENABLE := 0
endif
ARMNN_COMPUTE_NEON_ENABLE := 1
# Boot.img # Boot.img
BOARD_RAMDISK_USE_LZ4 := true BOARD_RAMDISK_USE_LZ4 := true
#BOARD_KERNEL_BASE := 0x80000000 #BOARD_KERNEL_BASE := 0x80000000

View file

@ -225,7 +225,7 @@ PRODUCT_SOONG_NAMESPACES += \
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
include device/google/gs101/neuralnetwork/neuralnetwork.mk include device/google/gs-common/gpu/gpu.mk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \

View file

@ -82,16 +82,6 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<version>1.3</version>
<interface>
<name>IDevice</name>
<instance>google-armnn</instance>
</interface>
<fqname>@1.3::IDevice/google-armnn</fqname>
</hal>
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.neuralnetworks</name> <name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>

View file

@ -13,16 +13,6 @@
<transport>hwbinder</transport> <transport>hwbinder</transport>
<fqname>@1.2::IBootControl/default</fqname> <fqname>@1.2::IBootControl/default</fqname>
</hal> </hal>
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<version>1.3</version>
<interface>
<name>IDevice</name>
<instance>google-armnn</instance>
</interface>
<fqname>@1.3::IDevice/google-armnn</fqname>
</hal>
<hal format="aidl"> <hal format="aidl">
<name>com.google.input.algos.spd</name> <name>com.google.input.algos.spd</name>
<interface> <interface>