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: I51b44b4e11444661cf965265113a22522568b9b1 Change-Id: I58316837c0ed87ce595be30657fd856969478809
This commit is contained in:
parent
96a18cc8c0
commit
185f372529
5 changed files with 1 additions and 33 deletions
|
@ -321,16 +321,6 @@ BOARD_VNDK_VERSION := current
|
|||
# H/W align restriction of MM IPs
|
||||
BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
|
||||
|
||||
# NeuralNetworks
|
||||
GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
|
||||
GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/gs101/prebuilts/gpu/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
|
||||
BOARD_RAMDISK_USE_LZ4 := true
|
||||
#BOARD_KERNEL_BASE := 0x80000000
|
||||
|
|
|
@ -199,7 +199,7 @@ PRODUCT_SOONG_NAMESPACES += \
|
|||
|
||||
$(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 += \
|
||||
libGLES_mali \
|
||||
|
|
10
manifest.xml
10
manifest.xml
|
@ -35,16 +35,6 @@
|
|||
<transport>hwbinder</transport>
|
||||
<fqname>@1.2::IBootControl/default</fqname>
|
||||
</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">
|
||||
<name>com.google.input.algos.spd</name>
|
||||
<interface>
|
||||
|
|
|
@ -22,16 +22,6 @@
|
|||
<transport>hwbinder</transport>
|
||||
<fqname>@1.2::IBootControl/default</fqname>
|
||||
</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">
|
||||
<name>android.hardware.neuralnetworks</name>
|
||||
<transport>hwbinder</transport>
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn
|
||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/
|
Loading…
Add table
Add a link
Reference in a new issue